修改判空方式

刘小明

2024-08-27 53a365fb64b49ee85f528341c785c4beab1d1f43

修改判空方式

 pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml

@@ -36,7 +36,7 @@
    <!--@mbg.generated-->
    insert into ba_log
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="userId != null and userId !=''">
      <if test="userId != null">
        user_id,
      </if>
      <if test="userName != null and userName !=''">
@@ -56,7 +56,7 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="userId != null and userId !=''">
      <if test="userId != null">
        #{userId,jdbcType=BIGINT},
      </if>
      <if test="userName != null and userName !=''">
@@ -82,7 +82,7 @@
    <include refid="Base_Column_List" />
    from ba_log r
    <trim prefix="where " suffixOverrides="and">
      <if test="userId != null and userId != ''">
      <if test="userId != null">
        user_id = #{userId,jdbcType=BIGINT} and
      </if>
      <if test="userName != null and userName != ''">
@@ -110,7 +110,7 @@
    select count(1)
    from ba_log r
    <trim prefix="where " suffixOverrides="and">
      <if test="userId != null and userId != ''">
      <if test="userId != null">
        user_id = #{userId,jdbcType=BIGINT} and
      </if>
      <if test="userName != null and userName != ''">

 pms-parent/pms-global/src/main/resources/mapper/BaPrivilegeMapper.xml

@@ -41,7 +41,7 @@
    inner join ba_user_role ur on rp.role_id = ur.role_id
    inner join ba_role r on ur.role_id = r.id
    where r.deleted != 1
    <if test="userId != null and userId !=''">
    <if test="userId != null">
      and ur.user_id = #{userId, jdbcType=BIGINT}
    </if>
  </select>
@@ -50,7 +50,7 @@
    select p.id
    from ba_privilege p
    inner join ba_role_privilege rp on p.id = rp.privilege_id
    <if test="roleId != null and roleId !=''">
    <if test="roleId != null">
      where rp.role_id = #{roleId, jdbcType=BIGINT}
    </if>
  </select>
@@ -59,7 +59,7 @@
<!--    select p.id,p.num,p.name,p.type-->
<!--    from ba_privilege p-->
<!--    inner join ba_role_privilege rp on p.id = rp.privilege_id-->
<!--    <if test="roleId != null and roleId !=''">-->
<!--    <if test="roleId != null">-->
<!--      where rp.role_id = #{roleId, jdbcType=BIGINT}-->
<!--    </if>-->
<!--  </select>-->
@@ -75,7 +75,7 @@
    <!--@mbg.generated-->
    insert into ba_privilege
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        id,
      </if>
      <if test="num != null and num !=''">
@@ -84,7 +84,7 @@
      <if test="name != null and name !=''">
        `name`,
      </if>
      <if test="type != null and type !=''">
      <if test="type != null">
        `type`,
      </if>
      <if test="typeName!= null and typeName !=''">
@@ -92,10 +92,10 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        #{id},
      </if>
      <if test="num != null and num !=''">
      <if test="num != null">
        #{num},
      </if>
      <if test="name != null and name !=''">

 pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml

@@ -42,7 +42,7 @@
    from ba_role r
    inner join ba_user_role ur on r.id = ur.role_id
    where r.deleted != 1
    <if test="userId != null and userId !=''">
    <if test="userId != null">
      and ur.user_id = #{userId}
    </if>
  </select>
@@ -64,30 +64,30 @@
    <!--@mbg.generated-->
    insert into ba_role
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        id,
      </if>
      <if test="name != null and name !=''">
        `name`,
      </if>
      <if test="disabled != null and disabled !=''">
      <if test="disabled != null">
        disabled,
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        deleted,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        #{id},
      </if>
      <if test="name != null and name !=''">
        #{name},
      </if>
      <if test="disabled != null and disabled !=''">
      <if test="disabled != null">
        #{disabled},
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        #{deleted},
      </if>
    </trim>
@@ -99,10 +99,10 @@
      <if test="name != null and name !=''">
        `name` = #{name},
      </if>
      <if test="disabled != null and disabled !=''">
      <if test="disabled != null">
        disabled = #{disabled},
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        deleted = #{deleted},
      </if>
    </set>
@@ -132,7 +132,7 @@
      <if test="name != null and name != ''">
        r.name like concat('%', #{name}, '%') and
      </if>
      <if test="disabled != null and disabled != ''">
      <if test="disabled != null">
        r.disabled =#{disabled,jdbcType=BOOLEAN} and
      </if>
      <if test="dt != null and dt != ''">
@@ -153,7 +153,7 @@
      <if test="name != null and name != ''">
        r.name like concat('%', #{name}, '%') and
      </if>
      <if test="disabled != null and disabled != ''">
      <if test="disabled != null">
        r.disabled =#{disabled,jdbcType=BOOLEAN} and
      </if>
      <if test="dt != null and dt != ''">

 pms-parent/pms-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml

@@ -32,18 +32,18 @@
    <!--@mbg.generated-->
    insert into ba_role_privilege
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="roleId != null and roleId !=''">
      <if test="roleId != null">
        role_id,
      </if>
      <if test="privilegeId!= null and privilegeId !=''">
      <if test="privilegeId!= null">
        privilege_id,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="roleId != null and roleId !=''">
      <if test="roleId != null">
        #{roleId},
      </if>
      <if test="privilegeId!= null and privilegeId !=''">
      <if test="privilegeId!= null">
        #{privilegeId},
      </if>
    </trim>

 pms-parent/pms-global/src/main/resources/mapper/BaSysSetMapper.xml

@@ -27,7 +27,7 @@
    <!--@mbg.generated-->
    insert into ba_sys_set
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        id,
      </if>
      <if test="sysName != null and sysName !=''">
@@ -35,7 +35,7 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        #{id},
      </if>
      <if test="sysName != null and sysName !=''">

 pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml

@@ -108,7 +108,7 @@
<!--      <if test="roleId != null and roleId !=''">-->
<!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
<!--      </if>-->
      <if test="disabled != null and disabled !=''">
      <if test="disabled != null">
        bu.disabled=#{disabled,jdbcType=BOOLEAN}
      </if>
    </trim>
@@ -129,7 +129,7 @@
<!--      <if test="roleId != null and roleId !=''">-->
<!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
<!--      </if>-->
      <if test="disabled != null and disabled !=''">
      <if test="disabled != null">
        bu.disabled=#{disabled,jdbcType=BOOLEAN}
      </if>
    </trim>
@@ -170,7 +170,7 @@
    <!--@mbg.generated-->
    insert into ba_user
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        id,
      </if>
      <if test="name != null and name !=''">
@@ -185,15 +185,15 @@
      <if test="supperAdmin!= null and supperAdmin !=''">
        supper_admin,
      </if>
      <if test="disabled != null and disabled !=''">
      <if test="disabled != null">
        disabled,
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        deleted,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        #{id},
      </if>
      <if test="name != null and name !=''">
@@ -208,10 +208,10 @@
      <if test="supperAdmin!= null and supperAdmin !=''">
        #{supperAdmin},
      </if>
      <if test="disabled != null and disabled !=''">
      <if test="disabled != null">
        #{disabled},
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        #{deleted},
      </if>
    </trim>
@@ -232,10 +232,10 @@
      <if test="supperAdmin!= null and supperAdmin !=''">
        supper_admin = #{supperAdmin},
      </if>
      <if test="disabled != null and disabled !=''">
      <if test="disabled != null">
        disabled = #{disabled},
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        deleted = #{deleted},
      </if>
    </set>

 pms-parent/pms-global/src/main/resources/mapper/BaUserRoleMapper.xml

@@ -20,7 +20,7 @@
    <!--@mbg.generated-->
    insert into ba_user_role
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="userId != null and userId !=''">
      <if test="userId != null">
        user_id,
      </if>
      <if test="roleId != null and roleId !=''">
@@ -28,7 +28,7 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="userId != null and userId !=''">
      <if test="userId != null">
        #{userId},
      </if>
      <if test="roleId != null and roleId !=''">

 pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml

@@ -42,7 +42,7 @@
    <!--@mbg.generated-->
    insert into oth_file
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        id,
      </if>
      <if test="orgName!= null and orgName !=''">
@@ -54,7 +54,7 @@
      <if test="newName!= null and newName !=''">
        new_name,
      </if>
      <if test="hash!= null and hash !=''">
      <if test="hash!= null">
        hash,
      </if>
      <if test="filePath!= null and filePath !=''">
@@ -65,7 +65,7 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        #{id},
      </if>
      <if test="orgName!= null and orgName !=''">
@@ -77,7 +77,7 @@
      <if test="newName!= null and newName !=''">
        #{newName},
      </if>
      <if test="hash!= null and hash !=''">
      <if test="hash!= null">
        #{hash},
      </if>
      <if test="filePath!= null and filePath !=''">
@@ -101,7 +101,7 @@
      <if test="newName!= null and newName !=''">
        new_name = #{newName},
      </if>
      <if test="hash!= null and hash !=''">
      <if test="hash!= null">
        hash = #{hash},
      </if>
      <if test="filePath!= null and filePath !=''">

 pms-parent/pms-global/src/main/resources/mapper/PltMaterialMapper.xml

@@ -54,30 +54,30 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltMaterial" useGeneratedKeys="true">
        insert into plt_material
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="proId != null and proId !=''">pro_id,</if>
                <if test="id != null">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="name != null and name !=''">name,</if>
                <if test="type != null and type !=''">type,</if>
                <if test="length!= null and length !=''">length,</if>
                <if test="factory != null and factory !=''">factory,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=INTEGER},</if>
                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=INTEGER},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
                <if test="type != null and type !=''">#{type,jdbcType=VARCHAR},</if>
                <if test="length!= null and length !=''">#{length,jdbcType=VARCHAR},</if>
                <if test="factory != null and factory !=''">#{factory,jdbcType=VARCHAR},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltMaterial">
        update plt_material
        <set>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="name != null and name !=''">
@@ -92,7 +92,7 @@
                <if test="factory != null and factory !=''">
                    factory = #{factory,jdbcType=VARCHAR},
                </if>
                <if test="deleted != null and deleted !=''">
                <if test="deleted != null">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="remark != null and remark !=''">

 pms-parent/pms-global/src/main/resources/mapper/PltProParamsMapper.xml

@@ -45,10 +45,10 @@
    <!--@mbg.generated-->
    insert into plt_product_params
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        id,
      </if>
      <if test="proId != null and proId !=''">
      <if test="proId != null">
        pro_id,
      </if>
      <if test="paramName!= null and paramName !=''">
@@ -57,15 +57,15 @@
      <if test="paramValue!= null and paramValue !=''">
        param_value,
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        deleted
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="proId != null and proId !=''">
      <if test="proId != null">
        #{proId,jdbcType=BIGINT},
      </if>
      <if test="paramName!= null and paramName !=''">
@@ -74,7 +74,7 @@
      <if test="paramValue!= null and paramValue !=''">
        #{paramValue,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        #{deleted,jdbcType=TINYINT}
      </if>
    </trim>
@@ -83,7 +83,7 @@
    <!--@mbg.generated-->
    update plt_product_params
    <set>
      <if test="proId != null and proId !=''">
      <if test="proId != null">
        pro_id = #{proId,jdbcType=BIGINT},
      </if>
      <if test="paramName!= null and paramName !=''">
@@ -92,7 +92,7 @@
      <if test="paramValue!= null and paramValue !=''">
        param_value = #{paramValue,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        deleted = #{deleted,jdbcType=TINYINT}
      </if>
    </set>

 pms-parent/pms-global/src/main/resources/mapper/PltProductFileMapper.xml

@@ -39,25 +39,25 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductFile" useGeneratedKeys="true">
        insert into plt_product_file
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="proId != null and proId !=''">pro_id,</if>
                <if test="fileId != null and fileId !=''">file_id,</if>
                <if test="id != null">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="fileId != null">file_id,</if>
                <if test="fileType != null and fileType !=''">file_type,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
                <if test="fileId != null and fileId !=''">#{fileId,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="fileId != null">#{fileId,jdbcType=BIGINT},</if>
                <if test="fileType != null and fileType !=''">#{fileType,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductFile">
        update plt_product_file
        <set>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="fileId != null and fileId !=''">
                <if test="fileId != null">
                    file_id = #{fileId,jdbcType=BIGINT},
                </if>
                <if test="fileType != null and fileType !=''">

 pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml

@@ -53,7 +53,7 @@
    <!--@mbg.generated-->
    insert into plt_product
    <trim prefix="(" suffix=")" suffixOverrides=",">
        <if test="id != null and id !=''">
        <if test="id != null">
          id,
        </if>
        <if test="code != null and code !=''">
@@ -74,7 +74,7 @@
        <if test="dMobile != null and dMobile !=''">
          d_mobile,
        </if>
        <if test="deleted != null and deleted !=''">
        <if test="deleted != null">
          deleted,
        </if>
        <if test="dt != null and dt !=''">
@@ -85,7 +85,7 @@
        </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
        <if test="id != null and id !=''">
        <if test="id != null">
          #{id,jdbcType=BIGINT},
        </if>
        <if test="code != null and code !=''">
@@ -106,7 +106,7 @@
        <if test="dMobile != null and dMobile !=''">
          #{dMobile,jdbcType=VARCHAR},
        </if>
        <if test="deleted != null and deleted !=''">
        <if test="deleted != null">
          #{deleted,jdbcType=VARCHAR },
        </if>
        <if test="dt != null and dt !=''">
@@ -198,11 +198,11 @@
            <property name="alias" value="p"/>
        </include>
        FROM
        <if test="orderId != null and orderId != ''">
        <if test="orderId != null">
            (select * from pr_order_item WHERE deleted!=1 AND order_id = #{orderId,jdbcType=BIGINT}) poi,
        </if>
        (select * from plt_product  where  deleted!=1) p
        <if test="orderId != null and orderId != ''">
        <if test="orderId != null">
            WHERE poi.pro_id = p.id
        </if>
        order by id desc
@@ -212,7 +212,7 @@
  </select>
    <select id="exists" resultType="java.lang.Boolean">
        select count(1) from plt_product where name = #{name}
        <if test="id != null and id !=''">
        <if test="id != null">
            and id != #{id}
        </if>
    </select>

 pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml

@@ -37,35 +37,35 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems" useGeneratedKeys="true">
        insert into plt_product_quality_inspection_items
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">id,</if>
            <if test="proId != null and proId !=''">pro_id,</if>
            <if test="id != null">id,</if>
            <if test="proId != null">pro_id,</if>
            <if test="item != null and item !=''">item,</if>
            <if test="sort != null and sort !=''">sort,</if>
            <if test="disabled != null and disabled !=''">disabled,</if>
            <if test="deleted != null and deleted !=''">deleted,</if>
            <if test="sort != null">sort,</if>
            <if test="disabled != null">disabled,</if>
            <if test="deleted != null">deleted,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
            <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
            <if test="item != null and item !=''">#{item,jdbcType=VARCHAR},</if>
            <if test="sort != null and sort !=''">#{sort,jdbcType=INTEGER},</if>
            <if test="disabled != null and disabled !=''">#{disabled,jdbcType=TINYINT},</if>
            <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
            <if test="sort != null">#{sort,jdbcType=INTEGER},</if>
            <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
            <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems">
        update plt_product_quality_inspection_items
        <set>
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT},
            </if>
            <if test="disabled != null and disabled !=''">
            <if test="disabled != null">
                disabled = #{disabled,jdbcType=BIGINT},
            </if>
            <if test="item != null and item !=''">
                item = #{item,jdbcType=VARCHAR},
            </if>
            <if test="sort != null and sort !=''">
            <if test="sort != null">
                sort = #{sort,jdbcType=INTEGER},
            </if>
        </set>
@@ -84,7 +84,7 @@
            <if test="item != null  and item != ''">
                t.item like concat('%', #{item}, '%') and
            </if>
            <if test="disabled != null  and disabled != ''">
            <if test="disabled != null">
                t.disabled != 1  and
                <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
            </if>
@@ -108,7 +108,7 @@
            <if test="item != null  and item != ''">
                t.item like concat('%', #{item}, '%') and
            </if>
            <if test="disabled != null  and disabled != ''">
            <if test="disabled != null">
                t.disabled != 1  and
            </if>
        </trim>

 pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml

@@ -42,18 +42,18 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason" useGeneratedKeys="true">
        insert into plt_product_scrapping_reason
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">id,</if>
            <if test="id != null">id,</if>
            <if test="reason != null and reason !=''">reason,</if>
            <if test="proId != null and proId !=''">pro_id,</if>
            <if test="sort != null and sort !=''">sort,</if>
            <if test="deleted != null and deleted !=''">deleted,</if>
            <if test="proId != null">pro_id,</if>
            <if test="sort != null">sort,</if>
            <if test="deleted != null">deleted,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="reason != null and reason !=''">#{reason,jdbcType=VARCHAR},</if>
            <if test="proId != null and proId !=''">#{proId,jdbcType=VARCHAR},</if>
            <if test="sort != null and sort !=''">#{sort,jdbcType=INTEGER},</if>
            <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
            <if test="proId != null">#{proId,jdbcType=VARCHAR},</if>
            <if test="sort != null">#{sort,jdbcType=INTEGER},</if>
            <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">
@@ -62,16 +62,16 @@
            <if test="reason != null and reason !=''">
                reason = #{reason,jdbcType=VARCHAR},
            </if>
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=VARCHAR},
            </if>
            <if test="sort != null and sort !=''">
            <if test="sort != null">
                sort = #{sort,jdbcType=INTEGER},
            </if>
            <if test="disabled != null and disabled !=''">
            <if test="disabled != null">
                disabled = #{disabled,jdbcType=TINYINT},
            </if>
            <if test="deleted != null and deleted !=''">
            <if test="deleted != null">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
        </set>

 pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml

@@ -32,13 +32,13 @@
        from plt_product_test_inspection_items t
        where t.deleted!=1
        <trim prefix="and" suffixOverrides="and">
            <if test="proId != null and proId != ''">
            <if test="proId != null">
                t.pro_id=#{proId} and
            </if>
            <if test="item != null  and item != ''">
                t.item like concat('%', #{item}, '%') and
            </if>
            <if test="disabled != null  and disabled != ''">
            <if test="disabled != null">
                t.disabled != 1  and
                <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
            </if>
@@ -51,13 +51,13 @@
        from plt_product_test_inspection_items t
        where t.deleted!=1
        <trim prefix="and" suffixOverrides="and">
            <if test="proId != null and proId != ''">
            <if test="proId != null">
                t.pro_id=#{proId} and
            </if>
            <if test="item != null  and item != ''">
                t.item like concat('%', #{item}, '%') and
            </if>
            <if test="disabled != null  and disabled != ''">
            <if test="disabled != null">
                t.disabled != 1  and
            </if>
        </trim>
@@ -85,38 +85,38 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems" useGeneratedKeys="true">
        insert into plt_product_test_inspection_items
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="proId != null and proId !=''">pro_id,</if>
                <if test="id != null">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="item != null and item !=''">item,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="disabled != null and disabled !=''">disabled,</if>
                <if test="sort != null and sort !=''">sort,</if>
                <if test="deleted != null">deleted,</if>
                <if test="disabled != null">disabled,</if>
                <if test="sort != null">sort,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="item != null and item !=''">#{item,jdbcType=VARCHAR},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="disabled != null and disabled !=''">#{disabled,jdbcType=TINYINT},</if>
                <if test="sort != null and sort !=''">#{sort,jdbcType=INTEGER},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
                <if test="sort != null">#{sort,jdbcType=INTEGER},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems">
        update plt_product_test_inspection_items
        <set>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="item != null and item !=''">
                    item = #{item,jdbcType=VARCHAR},
                </if>
                <if test="deleted != null and deleted !=''">
                <if test="deleted != null">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="disabled != null and disabled !=''">
                <if test="disabled != null">
                    disabled = #{disabled,jdbcType=TINYINT},
                </if>
                <if test="sort != null and sort !=''">
                <if test="sort != null">
                    sort = #{sort,jdbcType=INTEGER},
                </if>
        </set>

 pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml

@@ -29,36 +29,36 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason" useGeneratedKeys="true">
        insert into plt_product_unqualified_reason
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">id,</if>
            <if test="id != null">id,</if>
            <if test="reason != null and reason !=''">reason,</if>
            <if test="proId != null and proId !=''">pro_id,</if>
            <if test="sort != null and sort !=''">sort,</if>
            <if test="deleted != null and deleted !=''">deleted,</if>
            <if test="proId != null">pro_id,</if>
            <if test="sort != null">sort,</if>
            <if test="deleted != null">deleted,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="reason != null and reason !=''">#{reason,jdbcType=VARCHAR},</if>
                <if test="proId != null and proId !=''">#{proId,jdbcType=VARCHAR},</if>
                <if test="sort != null and sort !=''">#{sort,jdbcType=VARCHAR},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="proId != null">#{proId,jdbcType=VARCHAR},</if>
                <if test="sort != null">#{sort,jdbcType=VARCHAR},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason">
        update plt_product_unqualified_reason
        <set>
            <if test="disabled != null and disabled !=''">
            <if test="disabled != null">
                disabled = #{disabled,jdbcType=TINYINT},
            </if>
            <if test="reason != null and reason !=''">
                reason = #{reason,jdbcType=VARCHAR},
            </if>
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=VARCHAR},
            </if>
            <if test="sort != null and sort !=''">
            <if test="sort != null">
                sort = #{sort,jdbcType=VARCHAR},
            </if>
            <if test="deleted != null and deleted !=''">
            <if test="deleted != null">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
        </set>

 pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml

@@ -51,25 +51,25 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductionLine" useGeneratedKeys="true">
        insert into plt_production_line
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="id != null">id,</if>
                <if test="name != null and name !=''">name,</if>
                <if test="type != null and type !=''">type,</if>
                <if test="factory != null and factory !=''">factory,</if>
                <if test="director != null and director !=''">director,</if>
                <if test="dMobile != null and dMobile !=''">d_mobile,</if>
                <if test="installTime != null and installTime !=''">install_time,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
                <if test="type != null and type !=''">#{type,jdbcType=VARCHAR},</if>
                <if test="factory != null and factory !=''">#{factory,jdbcType=VARCHAR},</if>
                <if test="director != null and director !=''">#{director,jdbcType=VARCHAR},</if>
                <if test="dMobile != null and dMobile !=''">#{dMobile,jdbcType=VARCHAR},</if>
                <if test="installTime != null and installTime !=''">#{installTime,jdbcType=VARCHAR},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
@@ -94,10 +94,10 @@
            <if test="installTime != null and installTime !=''">
                install_time = #{installTime,jdbcType=VARCHAR},
            </if>
            <if test="disabled != null and disabled !=''">
            <if test="disabled != null">
                disabled = #{disabled},
            </if>
            <if test="deleted != null and deleted !=''">
            <if test="deleted != null">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
            <if test="remark != null and remark !=''">
@@ -166,7 +166,7 @@
    </select>
    <select id="selectByNameId" resultType="java.lang.Long">
        select count(1) from plt_production_line where name = #{name} and deleted != 1
        <if test="id != null and id !=''">
        <if test="id != null">
            and id != #{id}
        </if>
    </select>

 pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml

@@ -41,22 +41,22 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation" useGeneratedKeys="true">
        insert into plt_station
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="lineId != null and lineId !=''">line_id,</if>
                <if test="id != null">id,</if>
                <if test="lineId != null">line_id,</if>
                <if test="code != null and code !=''">code,</if>
                <if test="name != null and name !=''">name,</if>
                <if test="remark != null and remark !=''">remark,</if>
                <if test="disabled != null and disabled !=''">disabled,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="disabled != null">disabled,</if>
                <if test="deleted != null">deleted,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="lineId != null and lineId !=''">#{lineId,jdbcType=VARCHAR},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="lineId != null">#{lineId,jdbcType=VARCHAR},</if>
                <if test="code != null and code !=''">#{code,jdbcType=VARCHAR},</if>
                <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
                <if test="disabled != null and disabled !=''">#{disabled,jdbcType=TINYINT},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
@@ -71,10 +71,10 @@
            <if test="remark != null and remark !=''">
                remark = #{remark,jdbcType=VARCHAR},
            </if>
            <if test="disabled != null and disabled !=''">
            <if test="disabled != null">
                disabled = #{disabled,jdbcType=TINYINT},
            </if>
            <if test="deleted != null and deleted !=''">
            <if test="deleted != null">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
        </set>
@@ -106,7 +106,7 @@
        <include refid="Base_Column_List" />
        from plt_station where deleted!=1
        <trim prefix="and" suffixOverrides="and">
            <if test="id != null and id !=''">
            <if test="id != null">
                id = #{id,jdbcType=BIGINT} and
            </if>
            <if test="code != null and code !=''">
@@ -115,10 +115,10 @@
            <if test="name != null and name !=''">
                name  like concat('%', #{name}, '%') and
            </if>
            <if test="disabled != null and disabled !=''">
            <if test="disabled != null">
                disabled = #{disabled,jdbcType=TINYINT} and
            </if>
            <if test="lineId != null and lineId !=''">
            <if test="lineId != null">
                line_id = #{lineId,jdbcType=BIGINT} and
            </if>
        </trim>
@@ -140,7 +140,7 @@
    <select id="selectByCodeId" resultType="java.lang.Long">
        select count(1) from plt_station where code = #{code} and deleted!=1
        <trim prefix="and" suffixOverrides="and">
            <if test="id != null and id !=''">
            <if test="id != null">
                id != #{id}
            </if>
        </trim>

 pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml

@@ -95,7 +95,7 @@
        select count(1)
        from pr_assembly_plan
        where deleted = 0
        <if test="id != null and id !=''">
        <if test="id != null">
            and process_id = #{id}
        </if>
    </select>
@@ -133,25 +133,25 @@
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="orderId!= null and orderId !=''">
            <if test="orderId != null">
                order_id = #{orderId,jdbcType=BIGINT} and
            </if>
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <if test="batchId != null and batchId !=''">
            <if test="batchId != null">
                batch_id = #{batchId,jdbcType=BIGINT} and
            </if>
            <if test="processId!= null and processId !=''">
            <if test="processId!= null">
                process_id = #{processId,jdbcType=BIGINT} and
            </if>
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR} and
            </if>
            <if test="number != null and number !=''">
            <if test="number != null">
                number = #{number,jdbcType=INTEGER} and
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                status = #{status,jdbcType=TINYINT} and
            </if>
            <if test="creator != null and creator !=''">
@@ -166,7 +166,7 @@
            <if test="endDate != null and endDate !=''">
                end_date = #{endDate,jdbcType=VARCHAR} and
            </if>
            <if test="deleted != null and deleted !=''">
            <if test="deleted != null">
                deleted = #{deleted,jdbcType=TINYINT} and
            </if>
            <if test="content != null and content !=''">
@@ -180,25 +180,25 @@
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="orderId!= null and orderId !=''">
            <if test="orderId != null">
                order_id = #{orderId,jdbcType=BIGINT} and
            </if>
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <if test="batchId != null and batchId !=''">
            <if test="batchId != null">
                batch_id = #{batchId,jdbcType=BIGINT} and
            </if>
            <if test="processId!= null and processId !=''">
            <if test="processId!= null">
                process_id = #{processId,jdbcType=BIGINT} and
            </if>
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR} and
            </if>
            <if test="number != null and number !=''">
            <if test="number != null">
                number = #{number,jdbcType=INTEGER} and
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                status = #{status,jdbcType=TINYINT} and
            </if>
            <if test="creator != null and creator !=''">
@@ -213,7 +213,7 @@
            <if test="endDate != null and endDate !=''">
                end_date = #{endDate,jdbcType=VARCHAR} and
            </if>
            <if test="deleted != null and deleted !=''">
            <if test="deleted != null">
                deleted = #{deleted,jdbcType=TINYINT} and
            </if>
            <if test="content != null and content !=''">
@@ -247,64 +247,64 @@
            useGeneratedKeys="true">
        insert into pr_assembly_plan
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">id,</if>
            <if test="orderId!= null and orderId !=''">order_id,</if>
            <if test="proId != null and proId !=''">pro_id,</if>
            <if test="batchId != null and batchId !=''">batch_id,</if>
            <if test="processId != null and processId !=''">process_id,</if>
            <if test="id != null">id,</if>
            <if test="orderId != null">order_id,</if>
            <if test="proId != null">pro_id,</if>
            <if test="batchId != null">batch_id,</if>
            <if test="processId != null">process_id,</if>
            <if test="name != null and name !=''">name,</if>
            <if test="number != null and number !=''">number,</if>
            <if test="status != null and status !=''">status,</if>
            <if test="number != null">number,</if>
            <if test="status != null">status,</if>
            <if test="creator != null and creator !=''">creator,</if>
            <if test="dt != null and dt !=''">dt,</if>
            <if test="startDate != null and startDate !=''">start_date,</if>
            <if test="endDate != null and endDate !=''">end_date,</if>
            <if test="deleted != null and deleted !=''">deleted,</if>
            <if test="deleted != null">deleted,</if>
            <if test="content != null and content !=''">content,</if>
            <if test="inputNumber!= null and inputNumber !=''">input_number,</if>
            <if test="outputNumber!= null and outputNumber !=''">output_number,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
            <if test="orderId!= null and orderId !=''">#{orderId,jdbcType=BIGINT},</if>
            <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
            <if test="batchId != null and batchId !=''">#{batchId,jdbcType=BIGINT},</if>
            <if test="processId != null and processId !=''">#{processId,jdbcType=BIGINT},</if>
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="orderId != null">#{orderId,jdbcType=BIGINT},</if>
            <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
            <if test="batchId != null">#{batchId,jdbcType=BIGINT},</if>
            <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
            <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
            <if test="number != null and number !=''">#{number,jdbcType=INTEGER},</if>
            <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
            <if test="number != null">#{number,jdbcType=INTEGER},</if>
            <if test="status != null">#{status,jdbcType=TINYINT},</if>
            <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
            <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
            <if test="startDate != null and startDate !=''">#{startDate,jdbcType=VARCHAR},</if>
            <if test="endDate != null and endDate !=''">#{endDate,jdbcType=VARCHAR},</if>
            <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
            <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
            <if test="content != null and content !=''">#{content,jdbcType=VARCHAR},</if>
            <if test="inputNumber!= null and inputNumber !=''">#{inputNumber,jdbcType=INTEGER},</if>
            <if test="outputNumber!= null and outputNumber !=''">#{outputNumber,jdbcType=INTEGER},</if>
            <if test="inputNumber!= null">#{inputNumber,jdbcType=INTEGER},</if>
            <if test="outputNumber!= null">#{outputNumber,jdbcType=INTEGER},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
        update pr_assembly_plan
        <set>
            <if test="orderId!= null and orderId !=''">
            <if test="orderId != null">
                order_id = #{orderId,jdbcType=BIGINT} ,
            </if>
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT},
            </if>
            <if test="batchId != null and batchId !=''">
            <if test="batchId != null">
                batch_id = #{batchId,jdbcType=BIGINT},
            </if>
            <if test="processId!= null and processId !=''">
            <if test="processId!= null">
                process_id = #{processId,jdbcType=BIGINT},
            </if>
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR},
            </if>
            <if test="number != null and number !=''">
            <if test="number != null">
                number = #{number,jdbcType=INTEGER},
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                status = #{status,jdbcType=TINYINT},
            </if>
            <if test="creator != null and creator !=''">
@@ -319,7 +319,7 @@
            <if test="endDate != null and endDate !=''">
                end_date = #{endDate,jdbcType=VARCHAR},
            </if>
            <if test="deleted != null and deleted !=''">
            <if test="deleted != null">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
            <if test="content != null and content !=''">
@@ -360,7 +360,7 @@
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <if test="startDate != null and startDate != '' ">
@@ -382,7 +382,7 @@
        select count(1)
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <if test="startDate != null and startDate != '' ">
@@ -397,7 +397,7 @@
        select count(1) > 0
        from pr_assembly_plan
        where name = #{name,jdbcType=VARCHAR}
        <if test="id != null and id !=''">
        <if test="id != null">
            and id != #{id,jdbcType=BIGINT}
        </if>
    </select>

 pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml

@@ -45,17 +45,17 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrBatchNumber" useGeneratedKeys="true">
        insert into pr_batch_number
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="batchNumber!= null and batchNumber !=''">batch_number,</if>
                <if test="proId != null and proId !=''">pro_id,</if>
                <if test="id != null">id,</if>
                <if test="batchNumber!= null">batch_number,</if>
                <if test="proId != null">pro_id,</if>
                <if test="creator != null and creator !=''">creator,</if>
                <if test="dt != null and dt !=''">dt,</if>
                <if test="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="batchNumber!= null and batchNumber !=''">#{batchNumber,jdbcType=INTEGER},</if>
                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="batchNumber!= null">#{batchNumber,jdbcType=INTEGER},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
@@ -64,10 +64,10 @@
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrBatchNumber">
        update pr_batch_number
        <set>
                <if test="batchNumber!= null and batchNumber !=''">
                <if test="batchNumber!= null">
                    batch_number = #{batchNumber,jdbcType=INTEGER},
                </if>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="creator != null and creator !=''">
@@ -98,13 +98,13 @@
        <include refid="Base_Column_List" />
        from pr_batch_number
        <trim prefix="where" suffixOverrides="and">
                <if test="id != null and id !=''">
                <if test="id != null">
                    id = #{id,jdbcType=BIGINT} and
                </if>
                <if test="batchNumber!= null and batchNumber !=''">
                <if test="batchNumber!= null">
                    batch_number = #{batchNumber,jdbcType=INTEGER} and
                </if>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT} and
                </if>
                <if test="creator != null and creator !=''">
@@ -129,13 +129,13 @@
        select count(1)
        from pr_batch_number
        <trim prefix="where" suffixOverrides="and">
                <if test="id != null and id !=''">
                <if test="id != null">
                    id = #{id,jdbcType=BIGINT} and
                </if>
                <if test="batchNumber!= null and batchNumber !=''">
                    batch_number = #{batchNumber,jdbcType=INTEGER} and
                </if>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT} and
                </if>
                <if test="creator != null and creator !=''">

 pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml

@@ -50,25 +50,25 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevOpsPlan" useGeneratedKeys="true">
        insert into pr_dev_ops_plan
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="id != null">id,</if>
                <if test="name != null and name !=''">name,</if>
                <if test="status != null and status !=''">status,</if>
                <if test="status != null">status,</if>
                <if test="creator != null and creator !=''">creator,</if>
                <if test="dt != null and dt !=''">dt,</if>
                <if test="startDate != null and startDate !=''">start_date,</if>
                <if test="endDate != null and endDate !=''">end_date,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="deleted != null">deleted,</if>
                <if test="content != null and content !=''">content,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
                <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="startDate != null and startDate !=''">#{startDate,jdbcType=VARCHAR},</if>
                <if test="endDate != null and endDate !=''">#{endDate,jdbcType=VARCHAR},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="content != null and content !=''">#{content,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
@@ -78,7 +78,7 @@
                <if test="name != null and name !=''">
                    name = #{name,jdbcType=VARCHAR},
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="creator != null and creator !=''">
@@ -93,7 +93,7 @@
                <if test="endDate != null and endDate !=''">
                    end_date = #{endDate,jdbcType=VARCHAR},
                </if>
                <if test="deleted != null and deleted !=''">
                <if test="deleted != null">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="content != null and content !=''">
@@ -124,7 +124,7 @@
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR} and
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                status = #{status,jdbcType=TINYINT} and
            </if>
            <if test="startDate != null and startDate != '' ">
@@ -149,7 +149,7 @@
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR} and
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                status = #{status,jdbcType=TINYINT} and
            </if>
            <if test="startDate != null and startDate != '' ">
@@ -164,7 +164,7 @@
        select count(1) > 0
        from pr_dev_ops_plan
        where name = #{name,jdbcType=VARCHAR}
        <if test="id != null and id !=''">
        <if test="id != null">
            and id != #{id,jdbcType=BIGINT}
        </if>
    </select>

 pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml

@@ -42,18 +42,18 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice" useGeneratedKeys="true">
        insert into pr_device
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="proId != null and proId !=''">pro_id,</if>
                <if test="batchId != null and batchId !=''">batch_id,</if>
                <if test="id != null">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="batchId != null">batch_id,</if>
                <if test="deviceNo != null and deviceNo !=''">device_no,</if>
                <if test="status != null and status !=''">status,</if>
                <if test="status != null">status,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
                <if test="batchId != null and batchId !=''">#{batchId,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="batchId != null">#{batchId,jdbcType=BIGINT},</if>
                <if test="deviceNo != null and deviceNo !=''">#{deviceNo},</if>
                <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
        </trim>
    </insert>
    <insert id="insertBatch" parameterType="java.util.List">
@@ -72,16 +72,16 @@
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice">
        update pr_device
        <set>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="batchId != null and batchId !=''">
                <if test="batchId != null">
                    batch_id = #{batchId,jdbcType=BIGINT},
                </if>
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo},
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT}
                </if>
        </set>
@@ -102,19 +102,19 @@
        <include refid="Base_Column_List" />
        from pr_device
        <trim prefix="where" suffixOverrides="and">
                <if test="id != null and id !=''">
                <if test="id != null">
                    id = #{id,jdbcType=BIGINT} and
                </if>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT} and
                </if>
                <if test="batchId != null and batchId !=''">
                <if test="batchId != null">
                    batch_id = #{batchId,jdbcType=BIGINT} and
                </if>
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=BIGINT} and
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT} and
                </if>
        </trim>
@@ -130,19 +130,19 @@
        select count(1)
        from pr_device
        <trim prefix="where" suffixOverrides="and">
                <if test="id != null and id !=''">
                <if test="id != null">
                    id = #{id,jdbcType=BIGINT} and
                </if>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT} and
                </if>
                <if test="batchId != null and batchId !=''">
                <if test="batchId != null">
                    batch_id = #{batchId,jdbcType=BIGINT} and
                </if>
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=BIGINT} and
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT} and
                </if>
        </trim>

 pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml

@@ -54,39 +54,39 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem" useGeneratedKeys="true">
        insert into pr_order_item
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="orderId!= null and orderId !=''">order_id,</if>
                <if test="proId != null and proId !=''">pro_id,</if>
                <if test="number != null and number !=''">number,</if>
                <if test="completeNumber!= null and completeNumber !=''">complete_number,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="id != null">id,</if>
                <if test="orderId != null">order_id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="number != null">number,</if>
                <if test="completeNumber != null">complete_number,</if>
                <if test="deleted != null">deleted,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="orderId!= null and orderId !=''">#{orderId,jdbcType=BIGINT},</if>
                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
                <if test="number != null and number !=''">#{number,jdbcType=INTEGER},</if>
                <if test="completeNumber!= null and completeNumber !=''">#{completeNumber,jdbcType=INTEGER},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="orderId != null">#{orderId,jdbcType=BIGINT},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="number != null">#{number,jdbcType=INTEGER},</if>
                <if test="completeNumber != null">#{completeNumber,jdbcType=INTEGER},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem">
        <!--@mbg.generated-->
        update pr_order_item
        <set>
                <if test="orderId!= null and orderId !=''">
                <if test="orderId != null">
                    order_id = #{orderId,jdbcType=BIGINT},
                </if>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="number != null and number !=''">
                <if test="number != null">
                    number = #{number,jdbcType=INTEGER},
                </if>
                <if test="completeNumber!= null and completeNumber !=''">
                <if test="completeNumber != null">
                    complete_number = #{completeNumber,jdbcType=INTEGER},
                </if>
                <if test="deleted != null and deleted !=''">
                <if test="deleted != null">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
        </set>
@@ -101,7 +101,7 @@
        from pr_order_item p
        where p.deleted!=1
        <trim prefix="and " suffixOverrides="and">
            <if test="orderId != null and orderId != ''">
            <if test="orderId != null">
                p.order_id = #{orderId,jdbcType=BIGINT} and
            </if>
        </trim>
@@ -118,7 +118,7 @@
        from pr_order_item p
        where p.deleted!=1
        <trim prefix="and " suffixOverrides="and">
            <if test="orderId != null and orderId != ''">
            <if test="orderId != null">
                p.order_id = #{orderId,jdbcType=BIGINT} and
            </if>
        </trim>

 pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml

@@ -38,7 +38,7 @@
    </select>
    <select id="exists" resultType="java.lang.Boolean">
        select count(1) from pr_order where name = #{name}
        <if test="id != null and id !=''">
        <if test="id != null">
            and id != #{id}
        </if>
    </select>
@@ -148,7 +148,7 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder" useGeneratedKeys="true">
        insert into pr_order
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="id != null">id,</if>
                <if test="name != null and name !=''">name,</if>
                <if test="customerName!= null and customerName !=''">customer_name,</if>
                <if test="projectName!= null and projectName !=''">project_name,</if>
@@ -158,11 +158,11 @@
                <if test="status != null">status,</if>
                <if test="creator != null and creator !=''">creator,</if>
                <if test="dt != null and dt !=''">dt,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
                <if test="customerName!= null and customerName !=''">#{customerName,jdbcType=VARCHAR},</if>
                <if test="projectName!= null and projectName !=''">#{projectName,jdbcType=VARCHAR},</if>
@@ -172,7 +172,7 @@
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
@@ -206,7 +206,7 @@
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="deleted != null and deleted !=''">
                <if test="deleted != null">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="remark != null and remark !=''">

 pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml

@@ -59,29 +59,29 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionNode" useGeneratedKeys="true">
        insert into pr_production_node
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="isEnd!= null and isEnd !=''">process_id,</if>
                <if test="sort != null and sort !=''">sort,</if>
                <if test="id != null">id,</if>
                <if test="processId!= null">process_id,</if>
                <if test="sort != null">sort,</if>
                <if test="content != null and content !=''">content,</if>
                <if test="nodeType!= null and nodeType !=''">node_type,</if>
                <if test="isStart!= null and isStart !=''">is_start,</if>
                <if test="isEnd!= null and isEnd !=''">is_end,</if>
                <if test="isRecord!= null and isRecord !=''">is_record,</if>
                <if test="nodeType != null">node_type,</if>
                <if test="isStart != null">is_start,</if>
                <if test="isEnd != null">is_end,</if>
                <if test="isRecord != null">is_record,</if>
                <if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="isEnd!= null and isEnd !=''">#{processId,jdbcType=BIGINT},</if>
                <if test="sort != null and sort !=''">#{sort,jdbcType=INTEGER},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="isEnd != null">#{processId,jdbcType=BIGINT},</if>
                <if test="sort != null">#{sort,jdbcType=INTEGER},</if>
                <if test="content != null and content !=''">#{content,jdbcType=VARCHAR},</if>
                <if test="nodeType!= null and nodeType !=''">#{nodeType,jdbcType=INTEGER},</if>
                <if test="isStart!= null and isStart !=''">#{isStart,jdbcType=TINYINT},</if>
                <if test="isEnd!= null and isEnd !=''">#{isEnd,jdbcType=TINYINT},</if>
                <if test="isRecord!= null and isRecord !=''">#{isRecord,jdbcType=TINYINT},</if>
                <if test="nodeType != null">#{nodeType,jdbcType=INTEGER},</if>
                <if test="isStart != null">#{isStart,jdbcType=TINYINT},</if>
                <if test="isEnd != null">#{isEnd,jdbcType=TINYINT},</if>
                <if test="isRecord != null">#{isRecord,jdbcType=TINYINT},</if>
                <if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
@@ -110,31 +110,31 @@
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionNode">
        update pr_production_node
        <set>
                <if test="isEnd!= null and isEnd !=''">
                <if test="processId != null">
                    process_id = #{processId,jdbcType=BIGINT},
                </if>
                <if test="sort != null and sort !=''">
                <if test="sort != null">
                    sort = #{sort,jdbcType=INTEGER},
                </if>
                <if test="content != null and content !=''">
                    content = #{content,jdbcType=VARCHAR},
                </if>
                <if test="nodeType!= null and nodeType !=''">
                <if test="nodeType != null">
                    node_type = #{nodeType,jdbcType=INTEGER},
                </if>
                <if test="isStart!= null and isStart !=''">
                <if test="isStart != null">
                    is_start = #{isStart,jdbcType=TINYINT},
                </if>
                <if test="isEnd!= null and isEnd !=''">
                <if test="isEnd != null">
                    is_end = #{isEnd,jdbcType=TINYINT},
                </if>
                <if test="isRecord!= null and isRecord !=''">
                <if test="isRecord != null">
                    is_record = #{isRecord,jdbcType=TINYINT},
                </if>
                <if test="deviceCycleContent != null and deviceCycleContent !=''">
                    device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
                </if>
                <if test="deleted != null and deleted !=''">
                <if test="deleted != null">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="remark != null and remark !=''">
@@ -149,7 +149,7 @@
        <include refid="Base_Column_List" />
        from pr_production_node
        <trim prefix="where" suffixOverrides="and">
            <if test="processId!= null and processId !=''">
            <if test="processId!= null">
                process_id = #{processId,jdbcType=BIGINT} and
            </if>
        </trim>

 pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml

@@ -76,30 +76,30 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess" useGeneratedKeys="true">
        insert into pr_production_process
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="proId != null and proId !=''">pro_id,</if>
                <if test="id != null">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="name != null and name !=''">name,</if>
                <if test="creator != null and creator !=''">creator,</if>
                <if test="dt != null and dt !=''">dt,</if>
                <if test="disabled != null and disabled !=''">disabled,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="disabled != null">disabled,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
                <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="disabled != null and disabled !=''">#{disabled,jdbcType=TINYINT},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
        update pr_production_process
        <set>
                <if test="proId != null and proId !=''">
                <if test="proId != null">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="name != null and name !=''">
@@ -111,10 +111,10 @@
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="disabled != null and disabled !=''">
                <if test="disabled != null">
                    disabled = #{disabled,jdbcType=TINYINT},
                </if>
                <if test="deleted != null and deleted !=''">
                <if test="deleted != null">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="remark != null and remark !=''">
@@ -129,7 +129,7 @@
        <include refid="Base_Column_List" />
        from pr_production_process t
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
<!--            <if test="name != null and name !=''">-->
@@ -148,7 +148,7 @@
        select count(1)
        from pr_production_process t
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null and proId !=''">
            <if test="proId != null">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <!--            <if test="name != null and name !=''">-->
@@ -169,7 +169,7 @@
        select count(1)
        from pr_production_process
        where name = #{name} and deleted = 0
        <if test="id != null and id !=''">
        <if test="id != null">
            and id != #{id}
        </if>
    </select>

 pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml

@@ -41,16 +41,16 @@
    <!--@mbg.generated-->
    insert into pr_schedule
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        id,
      </if>
      <if test="userId != null and userId !=''">
      <if test="userId != null">
        user_id,
      </if>
      <if test="scheduleDate != null and scheduleDate !=''">
        schedule_date,
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        deleted,
      </if>
      <if test="dt != null and dt !=''">
@@ -58,16 +58,16 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="userId != null and userId !=''">
      <if test="userId != null">
        #{userId,jdbcType=BIGINT},
      </if>
      <if test="scheduleDate != null  and scheduleDate !=''">
        #{scheduleDate,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        #{deleted,jdbcType=TINYINT},
      </if>
      <if test="dt != null and dt !=''">
@@ -79,13 +79,13 @@
    <!--@mbg.generated-->
    update pr_schedule
    <set>
      <if test="userId != null and userId !=''">
      <if test="userId != null">
        user_id = #{userId,jdbcType=BIGINT},
      </if>
      <if test="scheduleDate != null  and scheduleDate !=''">
        schedule_date = #{scheduleDate,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null and deleted !=''">
      <if test="deleted != null">
        deleted = #{deleted,jdbcType=TINYINT},
      </if>
    </set>
@@ -104,7 +104,7 @@
    select count(1)
    from pr_schedule
    where deleted = 0
    <if test="userId != null and userId !=''">
    <if test="userId != null">
      and user_id = #{userId,jdbcType=BIGINT}
    </if>
    <if test="scheduleDate != null  and scheduleDate !=''">
@@ -117,7 +117,7 @@
    <include refid="Base_Column_List" />
    from pr_schedule
    where deleted = 0
    <if test="userId != null and userId !=''">
    <if test="userId != null">
      and user_id = #{userId}
    </if>
    <if test="scheduleDate != null  and scheduleDate !=''">
@@ -130,7 +130,7 @@
    <include refid="Base_Column_List" />
    from pr_schedule
    where deleted = 0
    <if test="userId != null  and userId !=''">
    <if test="userId != null">
      and user_id = #{userId}
    </if>
    <if test="scheduleDate != null  and scheduleDate !=''">

 pms-parent/pms-global/src/main/resources/mapper/PrScheduleRelMapper.xml

@@ -46,19 +46,19 @@
    <!--@mbg.generated-->
    insert into pr_schedule_rel
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        id,
      </if>
      <if test="scheduleId!= null and scheduleId !=''">
        schedule_id,
      </if>
      <if test="planId != null and planId !=''">
      <if test="planId != null">
        plan_id,
      </if>
      <if test="nodeId!= null and nodeId !=''">
      <if test="nodeId!= null">
        node_id,
      </if>
      <if test="stationId != null and stationId !=''">
      <if test="stationId != null">
        station_id,
      </if>
      <if test="workDetails!= null and workDetails !=''">
@@ -66,19 +66,19 @@
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null and id !=''">
      <if test="id != null">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="scheduleId!= null and scheduleId !=''">
        #{scheduleId,jdbcType=BIGINT},
      </if>
      <if test="planId != null and planId !=''">
      <if test="planId != null">
        #{planId,jdbcType=BIGINT},
      </if>
      <if test="nodeId!= null and nodeId !=''">
      <if test="nodeId!= null">
        #{nodeId,jdbcType=BIGINT},
      </if>
      <if test="stationId != null and stationId !=''">
      <if test="stationId != null">
        #{stationId,jdbcType=BIGINT},
      </if>
      <if test="workDetails!= null and workDetails !=''">
@@ -93,13 +93,13 @@
      <if test="scheduleId!= null and scheduleId !=''">
        schedule_id = #{scheduleId,jdbcType=BIGINT},
      </if>
      <if test="planId != null and planId !=''">
      <if test="planId != null">
        plan_id = #{planId,jdbcType=BIGINT},
      </if>
      <if test="nodeId!= null and nodeId !=''">
      <if test="nodeId!= null">
        node_id = #{nodeId,jdbcType=BIGINT},
      </if>
      <if test="stationId != null and stationId !=''">
      <if test="stationId != null">
        station_id = #{stationId,jdbcType=BIGINT},
      </if>
      <if test="workDetails!= null and workDetails !=''">

 pms-parent/pms-global/src/main/resources/mapper/PrWorkingInstructionMapper.xml

@@ -41,14 +41,14 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrWorkingInstruction" useGeneratedKeys="true">
        insert into pr_working_instruction
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="nodeId!= null and nodeId !=''">node_id,</if>
                <if test="fileId != null and fileId !=''">file_id,</if>
                <if test="id != null">id,</if>
                <if test="nodeId!= null">node_id,</if>
                <if test="fileId != null">file_id,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="nodeId!= null and nodeId !=''">#{nodeId,jdbcType=BIGINT},</if>
                <if test="fileId != null and fileId !=''">#{fileId,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="nodeId!= null">#{nodeId,jdbcType=BIGINT},</if>
                <if test="fileId != null">#{fileId,jdbcType=BIGINT},</if>
        </trim>
    </insert>
    <insert id="insertMany" parameterType="java.util.List">
@@ -68,10 +68,10 @@
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrWorkingInstruction">
        update pr_working_instruction
        <set>
                <if test="nodeId!= null and nodeId !=''">
                <if test="nodeId!= null">
                    node_id = #{nodeId,jdbcType=BIGINT},
                </if>
                <if test="fileId != null and fileId !=''">
                <if test="fileId != null">
                    file_id = #{fileId,jdbcType=BIGINT},
                </if>
        </set>

 pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml

@@ -54,31 +54,31 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory" useGeneratedKeys="true">
        insert into sta_assembly_work_history
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="workId != null and workId !=''">work_id,</if>
                <if test="userId != null and userId !=''">user_id,</if>
                <if test="lineId != null and lineId !=''">line_id,</if>
                <if test="stationId != null and stationId !=''">station_id,</if>
                <if test="planId != null and planId !=''">plan_id,</if>
                <if test="processId!= null and processId !=''">process_id,</if>
                <if test="nodeId!= null and nodeId !=''">node_id,</if>
                <if test="id != null">id,</if>
                <if test="workId != null">work_id,</if>
                <if test="userId != null">user_id,</if>
                <if test="lineId != null">line_id,</if>
                <if test="stationId != null">station_id,</if>
                <if test="planId != null">plan_id,</if>
                <if test="processId!= null">process_id,</if>
                <if test="nodeId!= null">node_id,</if>
                <if test="dt != null and dt !=''">dt,</if>
                <if test="status != null and status !=''">status,</if>
                <if test="status != null">status,</if>
                <if test="startTime != null and startTime !=''">start_time,</if>
                <if test="endTime != null and endTime !=''">end_time,</if>
                <if test="assistants != null and assistants !=''">assistants,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="workId != null and workId !=''">#{workId,jdbcType=BIGINT},</if>
                <if test="userId != null and userId !=''">#{userId,jdbcType=BIGINT},</if>
                <if test="lineId != null and lineId !=''">#{lineId,jdbcType=BIGINT},</if>
                <if test="stationId != null and stationId !=''">#{stationId,jdbcType=BIGINT},</if>
                <if test="planId != null and planId !=''">#{planId,jdbcType=BIGINT},</if>
                <if test="processId!= null and processId !=''">#{processId,jdbcType=BIGINT},</if>
                <if test="nodeId!= null and nodeId !=''">#{nodeId,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
                <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
                <if test="lineId != null">#{lineId,jdbcType=BIGINT},</if>
                <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="processId!= null">#{processId,jdbcType=BIGINT},</if>
                <if test="nodeId!= null">#{nodeId,jdbcType=BIGINT},</if>
                <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="startTime != null and startTime !=''">#{startTime,jdbcType=TIMESTAMP},</if>
                <if test="endTime != null and endTime !=''">#{endTime,jdbcType=TIMESTAMP},</if>
                <if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
@@ -87,31 +87,31 @@
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
        update sta_assembly_work_history
        <set>
                <if test="workId != null and workId !=''">
                <if test="workId != null">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="userId != null and userId !=''">
                <if test="userId != null">
                    user_id = #{userId,jdbcType=BIGINT},
                </if>
                <if test="lineId != null and lineId !=''">
                <if test="lineId != null">
                    line_id = #{lineId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null and stationId !=''">
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="planId != null and planId !=''">
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="processId!= null and processId !=''">
                <if test="processId!= null">
                    process_id = #{processId,jdbcType=BIGINT},
                </if>
                <if test="nodeId!= null and nodeId !=''">
                <if test="nodeId!= null">
                    node_id = #{nodeId,jdbcType=BIGINT},
                </if>
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="startTime != null and startTime !=''">

 pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml

@@ -98,7 +98,7 @@
<!--        <include refid="Base_Column_List"/>-->
<!--        from plt_station where status =1-->
<!--        <trim prefix="and" suffixOverrides="and">-->
<!--            <if test="id != null and id !=''">-->
<!--            <if test="id != null">-->
<!--                id = #{id,jdbcType=BIGINT} and-->
<!--            </if>-->
<!--            <if test="code != null and code !=''">-->
@@ -107,10 +107,10 @@
<!--            <if test="name != null and name !=''">-->
<!--                name like concat('%', #{name}, '%') and-->
<!--            </if>-->
<!--            <if test="disabled != null and disabled !=''">-->
<!--            <if test="disabled != null">-->
<!--                disabled = #{disabled,jdbcType=TINYINT} and-->
<!--            </if>-->
<!--            <if test="lineId != null and lineId !=''">-->
<!--            <if test="lineId != null">-->
<!--                line_id = #{lineId,jdbcType=BIGINT} and-->
<!--            </if>-->
<!--        </trim>-->
@@ -122,25 +122,25 @@
        <include refid="Base_Column_List"/>
        from sta_assembly_work_last
        <where>
            <if test="userId != null and userId !=''">
            <if test="userId != null">
                and user_id = #{userId,jdbcType=BIGINT}
            </if>
            <if test="lineId != null and lineId !=''">
            <if test="lineId != null">
                and line_id = #{lineId,jdbcType=BIGINT}
            </if>
            <if test="stationId != null and stationId !=''">
            <if test="stationId != null">
                and station_id = #{stationId,jdbcType=BIGINT}
            </if>
            <if test="planId != null and planId !=''">
            <if test="planId != null">
                and plan_id = #{planId,jdbcType=BIGINT}
            </if>
            <if test="processId != null and processId !=''">
            <if test="processId != null">
                and process_id = #{processId,jdbcType=BIGINT}
            </if>
            <if test="nodeId != null and nodeId !=''">
            <if test="nodeId != null">
                and node_id = #{nodeId,jdbcType=BIGINT}
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                and status = #{status,jdbcType=TINYINT}
            </if>
            <if test="startTime != null and startTime !=''">
@@ -204,25 +204,25 @@
            <if test="endTime != null and endTime !=''">
                and l.start_time <![CDATA[ < ]]> #{endTime}
            </if>
            <if test="userId != null and userId !=''">
            <if test="userId != null">
                and l.user_id = #{userId,jdbcType=BIGINT}
            </if>
            <if test="lineId != null and lineId !=''">
            <if test="lineId != null">
                and l.line_id = #{lineId,jdbcType=BIGINT}
            </if>
            <if test="stationId != null and stationId !=''">
            <if test="stationId != null">
                and l.station_id = #{stationId,jdbcType=BIGINT}
            </if>
            <if test="planId != null and planId !=''">
            <if test="planId != null">
                and l.plan_id = #{planId,jdbcType=BIGINT}
            </if>
            <if test="processId != null and processId !=''">
            <if test="processId != null">
                and l.process_id = #{processId,jdbcType=BIGINT}
            </if>
            <if test="nodeId != null and nodeId !=''">
            <if test="nodeId != null">
                and l.node_id = #{nodeId,jdbcType=BIGINT}
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                and l.status = #{status,jdbcType=TINYINT}
            </if>
            <if test="assistants != null and assistants !=''">
@@ -271,25 +271,25 @@
            <if test="endTime != null and endTime !=''">
                and l.start_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
            </if>
            <if test="userId != null and userId !=''">
            <if test="userId != null">
                and l.user_id = #{userId,jdbcType=BIGINT}
            </if>
            <if test="lineId != null and lineId !=''">
            <if test="lineId != null">
                and l.line_id = #{lineId,jdbcType=BIGINT}
            </if>
            <if test="stationId != null and stationId !=''">
            <if test="stationId != null">
                and l.station_id = #{stationId,jdbcType=BIGINT}
            </if>
            <if test="planId != null and planId !=''">
            <if test="planId != null">
                and l.plan_id = #{planId,jdbcType=BIGINT}
            </if>
            <if test="processId != null and processId !=''">
            <if test="processId != null">
                and l.process_id = #{processId,jdbcType=BIGINT}
            </if>
            <if test="nodeId != null and nodeId !=''">
            <if test="nodeId != null">
                and l.node_id = #{nodeId,jdbcType=BIGINT}
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                and l.status = #{status,jdbcType=TINYINT}
            </if>
            <if test="assistants != null and assistants !=''">
@@ -312,7 +312,7 @@
            </otherwise>
        </choose>
        <choose>
            <when test="processId != null and processId !=''">
            <when test="processId != null">
                and process_id = #{processId,jdbcType=BIGINT}
            </when>
            <otherwise>
@@ -328,7 +328,7 @@
            </otherwise>
        </choose>
        and work_type = #{workType,jdbcType=TINYINT}
        <if test="id != null and id !=''">
        <if test="id != null">
            and id != #{id,jdbcType=BIGINT}
        </if>
    </select>
@@ -354,31 +354,31 @@
            parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
        insert into sta_assembly_work_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">id,</if>
            <if test="userId != null and userId !=''">user_id,</if>
            <if test="lineId != null and lineId !=''">line_id,</if>
            <if test="stationId != null and stationId !=''">station_id,</if>
            <if test="planId != null and planId !=''">plan_id,</if>
            <if test="processId!= null and processId !=''">process_id,</if>
            <if test="nodeId!= null and nodeId !=''">node_id,</if>
            <if test="workType!= null and workType !=''">work_Type,</if>
            <if test="id != null">id,</if>
            <if test="userId != null">user_id,</if>
            <if test="lineId != null">line_id,</if>
            <if test="stationId != null">station_id,</if>
            <if test="planId != null">plan_id,</if>
            <if test="processId!= null">process_id,</if>
            <if test="nodeId!= null">node_id,</if>
            <if test="workType!= null">work_Type,</if>
            <if test="dt != null and dt !=''">dt,</if>
            <if test="status != null and status !=''">status,</if>
            <if test="status != null">status,</if>
            <if test="startTime != null and startTime !=''">start_time,</if>
            <if test="endTime != null and endTime !=''">end_time,</if>
            <if test="assistants != null and assistants !=''">assistants,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
            <if test="userId != null and userId !=''">#{userId,jdbcType=BIGINT},</if>
            <if test="lineId != null and lineId !=''">#{lineId,jdbcType=BIGINT},</if>
            <if test="stationId != null and stationId !=''">#{stationId,jdbcType=BIGINT},</if>
            <if test="planId != null and planId !=''">#{planId,jdbcType=BIGINT},</if>
            <if test="processId!= null and processId !=''">#{processId,jdbcType=BIGINT},</if>
            <if test="nodeId!= null and nodeId !=''">#{nodeId,jdbcType=BIGINT},</if>
            <if test="workType!= null and workType !=''">#{workType,jdbcType=TINYINT},</if>
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
            <if test="lineId != null">#{lineId,jdbcType=BIGINT},</if>
            <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
            <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
            <if test="processId!= null">#{processId,jdbcType=BIGINT},</if>
            <if test="nodeId!= null">#{nodeId,jdbcType=BIGINT},</if>
            <if test="workType!= null">#{workType,jdbcType=TINYINT},</if>
            <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
            <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
            <if test="status != null">#{status,jdbcType=TINYINT},</if>
            <if test="startTime != null and startTime !=''">#{startTime,jdbcType=TIMESTAMP},</if>
            <if test="endTime != null and endTime !=''">#{endTime,jdbcType=TIMESTAMP},</if>
            <if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
@@ -387,31 +387,31 @@
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
        update sta_assembly_work_last
        <set>
            <if test="userId != null and userId !=''">
            <if test="userId != null">
                user_id = #{userId,jdbcType=BIGINT},
            </if>
            <if test="lineId != null and lineId !=''">
            <if test="lineId != null">
                line_id = #{lineId,jdbcType=BIGINT},
            </if>
            <if test="stationId != null and stationId !=''">
            <if test="stationId != null">
                station_id = #{stationId,jdbcType=BIGINT},
            </if>
            <if test="planId != null and planId !=''">
            <if test="planId != null">
                plan_id = #{planId,jdbcType=BIGINT},
            </if>
            <if test="processId!= null and processId !=''">
            <if test="processId!= null">
                process_id = #{processId,jdbcType=BIGINT},
            </if>
            <if test="nodeId!= null and nodeId !=''">
            <if test="nodeId!= null">
                node_id = #{nodeId,jdbcType=BIGINT},
            </if>
            <if test="workType!= null and workType !=''">
            <if test="workType!= null">
                work_type = #{workType,jdbcType=TINYINT},
            </if>
            <if test="dt != null and dt !=''">
                dt = #{dt,jdbcType=TIMESTAMP},
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                status = #{status,jdbcType=TINYINT},
            </if>
            <if test="startTime != null and startTime !=''">

 pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml

@@ -38,33 +38,33 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo" useGeneratedKeys="true">
        insert into sta_dev_ops_task_claim_info
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="userId != null and userId !=''">user_id,</if>
                <if test="planId != null and planId !=''">plan_id,</if>
                <if test="id != null">id,</if>
                <if test="userId != null">user_id,</if>
                <if test="planId != null">plan_id,</if>
                <if test="dt != null and dt !=''">dt,</if>
                <if test="status != null and status !=''">status,</if>
                <if test="status != null">status,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="userId != null and userId !=''">#{userId,jdbcType=BIGINT},</if>
                <if test="planId != null and planId !=''">#{planId,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo">
        update sta_dev_ops_task_claim_info
        <set>
                <if test="userId != null and userId !=''">
                <if test="userId != null">
                    user_id = #{userId,jdbcType=BIGINT},
                </if>
                <if test="planId != null and planId !=''">
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
        </set>

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml

@@ -86,20 +86,20 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
        insert into sta_device_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">id,</if>
            <if test="id != null">id,</if>
            <if test="deviceNo != null and deviceNo !=''">device_no,</if>
            <if test="workId != null and workId !=''">work_id,</if>
            <if test="repairId != null and repairId !=''">repair_id,</if>
            <if test="planId != null and planId !=''">plan_id,</if>
            <if test="stationId != null and stationId !=''">station_id,</if>
            <if test="currNode != null and currNode !=''">curr_node,</if>
            <if test="workId != null">work_id,</if>
            <if test="repairId != null">repair_id,</if>
            <if test="planId != null">plan_id,</if>
            <if test="stationId != null">station_id,</if>
            <if test="currNode != null">curr_node,</if>
            <if test="nodeContent != null and nodeContent !=''">node_content,</if>
            <if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
            <if test="status != null and status !=''">status,</if>
            <if test="result != null and result !=''">result,</if>
            <if test="status != null">status,</if>
            <if test="result != null">result,</if>
            <if test="errorMsg != null and errorMsg !=''">error_msg,</if>
            <if test="assistants != null and assistants !=''">assistants,</if>
            <if test="updatedBy != null and updatedBy !=''">updated_by,</if>
            <if test="updatedBy != null">updated_by,</if>
            <if test="inTime != null and inTime !=''">in_time,</if>
            <if test="outTime != null and outTime !=''">out_time,</if>
            <if test="inLineTime != null and inLineTime !=''">in_line_time,</if>
@@ -107,20 +107,20 @@
            <if test="memo != null and memo !=''">memo,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if>
            <if test="workId != null and workId !=''">#{workId,jdbcType=BIGINT},</if>
            <if test="repairId != null and repairId !=''">#{repairId,jdbcType=BIGINT},</if>
            <if test="planId != null and planId !=''">#{planId,jdbcType=BIGINT},</if>
            <if test="stationId != null and stationId !=''">#{stationId,jdbcType=BIGINT},</if>
            <if test="currNode != null and currNode !=''">#{currNode,jdbcType=BIGINT},</if>
            <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
            <if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
            <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
            <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
            <if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
            <if test="nodeContent != null and nodeContent !=''">#{nodeContent,jdbcType=VARCHAR},</if>
            <if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
            <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
            <if test="result != null and result !=''">#{result,jdbcType=TINYINT},</if>
            <if test="status != null">#{status,jdbcType=TINYINT},</if>
            <if test="result != null">#{result,jdbcType=TINYINT},</if>
            <if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
            <if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
            <if test="updatedBy != null and updatedBy !=''">#{updatedBy,jdbcType=BIGINT},</if>
            <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
            <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if>
            <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if>
            <if test="inLineTime != null and inLineTime !=''">#{inLineTime,jdbcType=TIMESTAMP},</if>
@@ -134,19 +134,19 @@
            <if test="deviceNo != null and deviceNo !=''">
                device_no = #{deviceNo,jdbcType=VARCHAR},
            </if>
            <if test="workId != null and workId !=''">
            <if test="workId != null">
                work_id = #{workId,jdbcType=BIGINT},
            </if>
            <if test="repairId != null and repairId !=''">
            <if test="repairId != null">
                repair_id = #{repairId,jdbcType=BIGINT},
            </if>
            <if test="planId != null and planId !=''">
            <if test="planId != null">
                plan_id = #{planId,jdbcType=BIGINT},
            </if>
            <if test="stationId != null and stationId !=''">
            <if test="stationId != null">
                station_id = #{stationId,jdbcType=BIGINT},
            </if>
            <if test="currNode != null and currNode !=''">
            <if test="currNode != null">
                curr_node = #{currNode,jdbcType=BIGINT},
            </if>
            <if test="nodeContent != null and nodeContent !=''">
@@ -155,10 +155,10 @@
            <if test="deviceCycleContent != null and deviceCycleContent !=''">
                device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
            </if>
            <if test="status != null and status !=''">
            <if test="status != null">
                status = #{status,jdbcType=TINYINT},
            </if>
            <if test="result != null and result !=''">
            <if test="result != null">
                result = #{result,jdbcType=TINYINT},
            </if>
            <if test="errorMsg != null and errorMsg !=''">
@@ -167,7 +167,7 @@
            <if test="assistants != null and assistants !=''">
                assistants = #{assistants,jdbcType=VARCHAR},
            </if>
            <if test="updatedBy != null and updatedBy !=''">
            <if test="updatedBy != null">
                updated_by = #{updatedBy,jdbcType=BIGINT},
            </if>
            <if test="inTime != null and inTime !=''">

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml

@@ -81,39 +81,39 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast" useGeneratedKeys="true">
        insert into sta_device_life_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="id != null">id,</if>
                <if test="deviceNo != null and deviceNo !=''">device_no,</if>
                <if test="workId != null and workId !=''">work_id,</if>
                <if test="repairId != null and repairId !=''">repair_id,</if>
                <if test="planId != null and planId !=''">plan_id,</if>
                <if test="stationId != null and stationId !=''">station_id,</if>
                <if test="currNode != null and currNode !=''">curr_node,</if>
                <if test="workId != null">work_id,</if>
                <if test="repairId != null">repair_id,</if>
                <if test="planId != null">plan_id,</if>
                <if test="stationId != null">station_id,</if>
                <if test="currNode != null">curr_node,</if>
                <if test="nodeContent != null and nodeContent !=''">node_content,</if>
                <if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
                <if test="status != null and status !=''">status,</if>
                <if test="status != null">status,</if>
                <if test="errorMsg != null and errorMsg !=''">error_msg,</if>
                <if test="assistants != null and assistants !=''">assistants,</if>
                <if test="inTime != null and inTime !=''">in_time,</if>
                <if test="outTime != null and outTime !=''">out_time,</if>
                <if test="updatedBy != null and updatedBy !=''">updated_by,</if>
                <if test="updatedBy != null">updated_by,</if>
                <if test="memo != null and memo !=''">memo,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if>
                <if test="workId != null and workId !=''">#{workId,jdbcType=BIGINT},</if>
                <if test="repairId != null and repairId !=''">#{repairId,jdbcType=BIGINT},</if>
                <if test="planId != null and planId !=''">#{planId,jdbcType=BIGINT},</if>
                <if test="stationId != null and stationId !=''">#{stationId,jdbcType=BIGINT},</if>
                <if test="currNode != null and currNode !=''">#{currNode,jdbcType=BIGINT},</if>
                <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
                <if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
                <if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
                <if test="nodeContent != null and nodeContent !=''">#{nodeContent,jdbcType=VARCHAR},</if>
                <if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
                <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
                <if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
                <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if>
                <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if>
                <if test="updatedBy != null and updatedBy !=''">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
@@ -123,19 +123,19 @@
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="workId != null and workId !=''">
                <if test="workId != null">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="repairId != null and repairId !=''">
                <if test="repairId != null">
                    repair_id = #{repairId,jdbcType=BIGINT},
                </if>
                <if test="planId != null and planId !=''">
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null and stationId !=''">
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null and currNode !=''">
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nodeContent != null and nodeContent !=''">
@@ -144,7 +144,7 @@
                <if test="deviceCycleContent != null and deviceCycleContent !=''">
                    device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="errorMsg != null and errorMsg !=''">
@@ -159,7 +159,7 @@
                <if test="outTime != null and outTime !=''">
                    out_time = #{outTime,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null and updatedBy !=''">
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="memo != null and memo !=''">

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml

@@ -84,41 +84,41 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
        insert into sta_device_life
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="id != null">id,</if>
                <if test="deviceNo != null and deviceNo !=''">device_no,</if>
                <if test="workId != null and workId !=''">work_id,</if>
                <if test="repairId != null and repairId !=''">repair_id,</if>
                <if test="planId != null and planId !=''">plan_id,</if>
                <if test="stationId != null and stationId !=''">station_id,</if>
                <if test="currNode != null and currNode !=''">curr_node,</if>
                <if test="workId != null">work_id,</if>
                <if test="repairId != null">repair_id,</if>
                <if test="planId != null">plan_id,</if>
                <if test="stationId != null">station_id,</if>
                <if test="currNode != null">curr_node,</if>
                <if test="nodeContent != null and nodeContent !=''">node_content,</if>
                <if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
                <if test="status != null and status !=''">status,</if>
                <if test="result != null and result !=''">result,</if>
                <if test="status != null">status,</if>
                <if test="result != null">result,</if>
                <if test="errorMsg != null and errorMsg !=''">error_msg,</if>
                <if test="assistants != null and assistants !=''">assistants,</if>
                <if test="inTime != null and inTime !=''">in_time,</if>
                <if test="outTime != null and outTime !=''">out_time,</if>
                <if test="updatedBy != null and updatedBy !=''">updated_by,</if>
                <if test="updatedBy != null">updated_by,</if>
                <if test="memo != null and memo !=''">memo,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if>
                <if test="workId != null and workId !=''">#{workId,jdbcType=BIGINT},</if>
                <if test="repairId != null and repairId !=''">#{repairId,jdbcType=BIGINT},</if>
                <if test="planId != null and planId !=''">#{planId,jdbcType=BIGINT},</if>
                <if test="stationId != null and stationId !=''">#{stationId,jdbcType=BIGINT},</if>
                <if test="currNode != null and currNode !=''">#{currNode,jdbcType=BIGINT},</if>
                <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
                <if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
                <if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
                <if test="nodeContent != null and nodeContent !=''">#{nodeContent,jdbcType=VARCHAR},</if>
                <if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
                <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
                <if test="result != null and result !=''">#{result,jdbcType=TINYINT},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="result != null">#{result,jdbcType=TINYINT},</if>
                <if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
                <if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
                <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if>
                <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if>
                <if test="updatedBy != null and updatedBy !=''">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
@@ -128,19 +128,19 @@
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="workId != null and workId !=''">
                <if test="workId != null">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="repairId != null and repairId !=''">
                <if test="repairId != null">
                    repair_id = #{repairId,jdbcType=BIGINT},
                </if>
                <if test="planId != null and planId !=''">
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null and stationId !=''">
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null and currNode !=''">
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nodeContent != null and nodeContent !=''">
@@ -149,10 +149,10 @@
                <if test="deviceCycleContent != null and deviceCycleContent !=''">
                    device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="result != null and result !=''">
                <if test="result != null">
                    result = #{result,jdbcType=TINYINT},
                </if>
                <if test="errorMsg != null and errorMsg !=''">
@@ -167,7 +167,7 @@
                <if test="outTime != null and outTime !=''">
                    out_time = #{outTime,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null and updatedBy !=''">
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="memo != null and memo !=''">

 pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml

@@ -123,44 +123,44 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
        insert into sta_device_production_log
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="id != null">id,</if>
                <if test="deviceNo != null and deviceNo !=''">device_no,</if>
                <if test="workId != null and workId !=''">work_id,</if>
                <if test="repairId != null and repairId !=''">repair_id,</if>
                <if test="planId != null and planId !=''">plan_id,</if>
                <if test="stationId != null and stationId !=''">station_id,</if>
                <if test="currNode != null and currNode !=''">curr_node,</if>
                <if test="workId != null">work_id,</if>
                <if test="repairId != null">repair_id,</if>
                <if test="planId != null">plan_id,</if>
                <if test="stationId != null">station_id,</if>
                <if test="currNode != null">curr_node,</if>
                <if test="nodeContent != null and nodeContent !=''">node_content,</if>
                <if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
                <if test="status != null and status !=''">status,</if>
                <if test="result != null and result !=''">result,</if>
                <if test="status != null">status,</if>
                <if test="result != null">result,</if>
                <if test="errorMsg != null and errorMsg !=''">error_msg,</if>
                <if test="assistants != null and assistants !=''">assistants,</if>
                <if test="inTime != null and inTime !=''">in_time,</if>
                <if test="outTime != null and outTime !=''">out_time,</if>
                <if test="updatedBy != null and updatedBy !=''">updated_by,</if>
                <if test="updatedBy != null">updated_by,</if>
                <if test="memo != null and memo !=''">memo,</if>
                <if test="number != null and number !=''">number,</if>
                <if test="number != null">number,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if>
                <if test="workId != null and workId !=''">#{workId,jdbcType=BIGINT},</if>
                <if test="repairId != null and repairId !=''">#{repairId,jdbcType=BIGINT},</if>
                <if test="planId != null and planId !=''">#{planId,jdbcType=BIGINT},</if>
                <if test="stationId != null and stationId !=''">#{stationId,jdbcType=BIGINT},</if>
                <if test="currNode != null and currNode !=''">#{currNode,jdbcType=BIGINT},</if>
                <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
                <if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
                <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
                <if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
                <if test="nodeContent != null and nodeContent !=''">#{nodeContent,jdbcType=VARCHAR},</if>
                <if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
                <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
                <if test="result != null and result !=''">#{result,jdbcType=TINYINT},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="result != null">#{result,jdbcType=TINYINT},</if>
                <if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
                <if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
                <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if>
                <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if>
                <if test="updatedBy != null and updatedBy !=''">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
                <if test="number != null and number !=''">#{number,jdbcType=INTEGER},</if>
                <if test="number != null">#{number,jdbcType=INTEGER},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
@@ -169,19 +169,19 @@
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="workId != null and workId !=''">
                <if test="workId != null">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="repairId != null and repairId !=''">
                <if test="repairId != null">
                    repair_id = #{repairId,jdbcType=BIGINT},
                </if>
                <if test="planId != null and planId !=''">
                <if test="planId != null">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null and stationId !=''">
                <if test="stationId != null">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null and currNode !=''">
                <if test="currNode != null">
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nodeContent != null and nodeContent !=''">
@@ -190,10 +190,10 @@
                <if test="deviceCycleContent != null and deviceCycleContent !=''">
                    device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
                </if>
                <if test="status != null and status !=''">
                <if test="status != null">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="result != null and result !=''">
                <if test="result != null">
                    result = #{result,jdbcType=TINYINT},
                </if>
                <if test="errorMsg != null and errorMsg !=''">
@@ -208,13 +208,13 @@
                <if test="outTime != null and outTime !=''">
                    out_time = #{outTime,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null and updatedBy !=''">
                <if test="updatedBy != null">
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="memo != null and memo !=''">
                    memo = #{memo,jdbcType=VARCHAR},
                </if>
                <if test="number != null and number !=''">
                <if test="number != null">
                    number = #{number,jdbcType=INTEGER},
                </if>
        </set>

 pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml

@@ -48,21 +48,21 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo" useGeneratedKeys="true">
        insert into sta_repair_info
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="id != null">id,</if>
                <if test="deviceNo != null and deviceNo !=''">device_no,</if>
                <if test="workId != null and workId !=''">work_id,</if>
                <if test="fromNode != null and fromNode !=''">from_node,</if>
                <if test="workId != null">work_id,</if>
                <if test="fromNode != null">from_node,</if>
                <if test="repairReason != null and repairReason !=''">repair_reason,</if>
                <if test="repairBy != null and repairBy !=''">repair_by,</if>
                <if test="repairBy != null">repair_by,</if>
                <if test="repairTime != null and repairTime !=''">repair_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if>
                <if test="workId != null and workId !=''">#{workId,jdbcType=BIGINT},</if>
                <if test="fromNode != null and fromNode !=''">#{fromNode,jdbcType=BIGINT},</if>
                <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
                <if test="fromNode != null">#{fromNode,jdbcType=BIGINT},</if>
                <if test="repairReason != null and repairReason !=''">#{repairReason,jdbcType=VARCHAR},</if>
                <if test="repairBy != null and repairBy !=''">#{repairBy,jdbcType=BIGINT},</if>
                <if test="repairBy != null">#{repairBy,jdbcType=BIGINT},</if>
                <if test="repairTime != null and repairTime !=''">#{repairTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
@@ -72,16 +72,16 @@
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="workId != null and workId !=''">
                <if test="workId != null">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="fromNode != null and fromNode !=''">
                <if test="fromNode != null">
                    from_node = #{fromNode,jdbcType=BIGINT},
                </if>
                <if test="repairReason != null and repairReason !=''">
                    repair_reason = #{repairReason,jdbcType=VARCHAR},
                </if>
                <if test="repairBy != null and repairBy !=''">
                <if test="repairBy != null">
                    repair_by = #{repairBy,jdbcType=BIGINT},
                </if>
                <if test="repairTime != null and repairTime !=''">

 pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml

@@ -49,22 +49,22 @@
    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx" useGeneratedKeys="true">
        insert into sta_wip_sn_ex
        <trim prefix="(" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">id,</if>
                <if test="id != null">id,</if>
                <if test="deviceNo != null and deviceNo !=''">device_no,</if>
                <if test="productId != null and productId !=''">product_id,</if>
                <if test="productId != null">product_id,</if>
                <if test="productName != null and productName !=''">product_name,</if>
                <if test="productNo!= null and productNo !=''">product_no,</if>
                <if test="createTime != null and createTime !=''">create_time,</if>
                <if test="createBy != null and createBy !=''">create_by,</if>
                <if test="createBy != null">create_by,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if>
                <if test="productId != null and productId !=''">#{productId,jdbcType=BIGINT},</if>
                <if test="productId != null">#{productId,jdbcType=BIGINT},</if>
                <if test="productName != null and productName !=''">#{productName,jdbcType=VARCHAR},</if>
                <if test="productNo!= null and productNo !=''">#{productNo,jdbcType=VARCHAR},</if>
                <if test="createTime != null and createTime !=''">#{createTime,jdbcType=TIMESTAMP},</if>
                <if test="createBy != null and createBy !=''">#{createBy,jdbcType=BIGINT},</if>
                <if test="createBy != null">#{createBy,jdbcType=BIGINT},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
@@ -73,7 +73,7 @@
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="productId != null and productId !=''">
                <if test="productId != null">
                    product_id = #{productId,jdbcType=BIGINT},
                </if>
                <if test="productName != null and productName !=''">
@@ -85,7 +85,7 @@
                <if test="createTime != null and createTime !=''">
                    create_time = #{createTime,jdbcType=TIMESTAMP},
                </if>
                <if test="createBy != null and createBy !=''">
                <if test="createBy != null">
                    create_by = #{createBy,jdbcType=BIGINT},
                </if>
        </set>