刘小明
2024-08-26 591e3b8a10ed15023f3ad9e5a72a887ef89b0bb2
修改判空方式
38个文件已修改
1920 ■■■■ 已修改文件
pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/BaPrivilegeMapper.xml 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/BaSysSetMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/BaUserRoleMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltMaterialMapper.xml 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltProParamsMapper.xml 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltProductFileMapper.xml 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml 154 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrOrderMapper.xml 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrScheduleRelMapper.xml 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/PrWorkingInstructionMapper.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml 92 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml 112 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml 94 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml 100 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml 114 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -36,42 +36,42 @@
    <!--@mbg.generated-->
    insert into ba_log
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="userId != null">
      <if test="userId != null and userId !=''">
        user_id,
      </if>
      <if test="userName != null">
      <if test="userName != null and userName !=''">
        user_name,
      </if>
      <if test="content != null">
      <if test="content != null and content !=''">
        content,
      </if>
      <if test="code != null">
      <if test="code != null and code !=''">
        code,
      </if>
      <if test="msg != null">
      <if test="msg != null and msg !=''">
        msg,
      </if>
      <if test="ip != null">
      <if test="ip != null and ip !=''">
        ip,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="userId != null">
      <if test="userId != null and userId !=''">
        #{userId,jdbcType=BIGINT},
      </if>
      <if test="userName != null">
      <if test="userName != null and userName !=''">
        #{userName,jdbcType=VARCHAR},
      </if>
      <if test="content != null">
      <if test="content != null and content !=''">
        #{content,jdbcType=VARCHAR},
      </if>
      <if test="code != null">
      <if test="code != null and code !=''">
        #{code,jdbcType=VARCHAR},
      </if>
      <if test="msg != null">
      <if test="msg != null and msg !=''">
        #{msg,jdbcType=VARCHAR},
      </if>
      <if test="ip != null">
      <if test="ip != null and ip !=''">
        #{ip,jdbcType=VARCHAR},
      </if>
    </trim>
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">
    <if test="userId != null and userId !=''">
      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">
    <if test="roleId != null and roleId !=''">
      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">-->
<!--    <if test="roleId != null and roleId !=''">-->
<!--      where rp.role_id = #{roleId, jdbcType=BIGINT}-->
<!--    </if>-->
<!--  </select>-->
@@ -75,36 +75,36 @@
    <!--@mbg.generated-->
    insert into ba_privilege
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        id,
      </if>
      <if test="num != null">
      <if test="num != null and num !=''">
        num,
      </if>
      <if test="name != null">
      <if test="name != null and name !=''">
        `name`,
      </if>
      <if test="type != null">
      <if test="type != null and type !=''">
        `type`,
      </if>
      <if test="typeName != null">
      <if test="typeName!= null and typeName !=''">
        type_name,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        #{id},
      </if>
      <if test="num != null">
      <if test="num != null and num !=''">
        #{num},
      </if>
      <if test="name != null">
      <if test="name != null and name !=''">
        #{name},
      </if>
      <if test="type != null">
      <if test="type != null and type !=''">
        #{type},
      </if>
      <if test="typeName != null">
      <if test="typeName!= null and typeName !=''">
        #{typeName},
      </if>
    </trim>
@@ -113,16 +113,16 @@
    <!--@mbg.generated-->
    update ba_privilege
    <set>
      <if test="num != null">
      <if test="num != null and num !=''">
        num = #{num},
      </if>
      <if test="name != null">
      <if test="name != null and name !=''">
        `name` = #{name},
      </if>
      <if test="type != null">
      <if test="type != null and type !=''">
        `type` = #{type},
      </if>
      <if test="typeName != null">
      <if test="typeName!= null and typeName !=''">
        type_name = #{typeName},
      </if>
    </set>
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">
    <if test="userId != null and userId !=''">
      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">
      <if test="id != null and id !=''">
        id,
      </if>
      <if test="name != null">
      <if test="name != null and name !=''">
        `name`,
      </if>
      <if test="disabled != null">
      <if test="disabled != null and disabled !=''">
        disabled,
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        deleted,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        #{id},
      </if>
      <if test="name != null">
      <if test="name != null and name !=''">
        #{name},
      </if>
      <if test="disabled != null">
      <if test="disabled != null and disabled !=''">
        #{disabled},
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        #{deleted},
      </if>
    </trim>
@@ -96,13 +96,13 @@
    <!--@mbg.generated-->
    update ba_role
    <set>
      <if test="name != null">
      <if test="name != null and name !=''">
        `name` = #{name},
      </if>
      <if test="disabled != null">
      <if test="disabled != null and disabled !=''">
        disabled = #{disabled},
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        deleted = #{deleted},
      </if>
    </set>
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">
      <if test="roleId != null and roleId !=''">
        role_id,
      </if>
      <if test="privilegeId != null">
      <if test="privilegeId!= null and privilegeId !=''">
        privilege_id,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="roleId != null">
      <if test="roleId != null and roleId !=''">
        #{roleId},
      </if>
      <if test="privilegeId != null">
      <if test="privilegeId!= null and privilegeId !=''">
        #{privilegeId},
      </if>
    </trim>
pms-parent/pms-global/src/main/resources/mapper/BaSysSetMapper.xml
@@ -27,18 +27,18 @@
    <!--@mbg.generated-->
    insert into ba_sys_set
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        id,
      </if>
      <if test="sysName != null">
      <if test="sysName != null and sysName !=''">
        sys_name,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        #{id},
      </if>
      <if test="sysName != null">
      <if test="sysName != null and sysName !=''">
        #{sysName},
      </if>
    </trim>
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -105,10 +105,10 @@
      <if test="phone != null and phone !=''">
        bu.phone = #{phone,jdbcType=VARCHAR} and
      </if>
<!--      <if test="roleId != null">-->
<!--      <if test="roleId != null and roleId !=''">-->
<!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
<!--      </if>-->
      <if test="disabled != null">
      <if test="disabled != null and disabled !=''">
        bu.disabled=#{disabled,jdbcType=BOOLEAN}
      </if>
    </trim>
@@ -126,10 +126,10 @@
      <if test="phone != null and phone !=''">
        bu.phone = #{phone,jdbcType=VARCHAR} and
      </if>
<!--      <if test="roleId != null">-->
<!--      <if test="roleId != null and roleId !=''">-->
<!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
<!--      </if>-->
      <if test="disabled != null">
      <if test="disabled != null and disabled !=''">
        bu.disabled=#{disabled,jdbcType=BOOLEAN}
      </if>
    </trim>
@@ -142,7 +142,7 @@
  </select>
  <select id="selectNamesByAssistants" parameterType="java.lang.String" resultType="java.lang.String">
    SELECT GROUP_CONCAT(name) AS assistantNames FROM ba_user WHERE id IN
    <if test="assistants != null">
    <if test="assistants != null and assistants !=''">
      <foreach collection="assistants.split(',')" item="item" separator="," open="(" close=")">
        #{item,jdbcType=BIGINT}
      </foreach>
@@ -170,48 +170,48 @@
    <!--@mbg.generated-->
    insert into ba_user
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        id,
      </if>
      <if test="name != null">
      <if test="name != null and name !=''">
        `name`,
      </if>
      <if test="phone != null">
      <if test="phone!= null and phone !=''">
        phone,
      </if>
      <if test="password != null">
      <if test="password!= null and password !=''">
        `password`,
      </if>
      <if test="supperAdmin != null">
      <if test="supperAdmin!= null and supperAdmin !=''">
        supper_admin,
      </if>
      <if test="disabled != null">
      <if test="disabled != null and disabled !=''">
        disabled,
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        deleted,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        #{id},
      </if>
      <if test="name != null">
      <if test="name != null and name !=''">
        #{name},
      </if>
      <if test="phone != null">
      <if test="phone!= null and phone !=''">
        #{phone},
      </if>
      <if test="password != null">
      <if test="password!= null and password !=''">
        #{password},
      </if>
      <if test="supperAdmin != null">
      <if test="supperAdmin!= null and supperAdmin !=''">
        #{supperAdmin},
      </if>
      <if test="disabled != null">
      <if test="disabled != null and disabled !=''">
        #{disabled},
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        #{deleted},
      </if>
    </trim>
@@ -220,22 +220,22 @@
    <!--@mbg.generated-->
    update ba_user
    <set>
      <if test="name != null">
      <if test="name != null and name !=''">
        `name` = #{name},
      </if>
      <if test="phone != null">
      <if test="phone!= null and phone !=''">
        phone = #{phone},
      </if>
      <if test="password != null">
      <if test="password!= null and password !=''">
        `password` = #{password},
      </if>
      <if test="supperAdmin != null">
      <if test="supperAdmin!= null and supperAdmin !=''">
        supper_admin = #{supperAdmin},
      </if>
      <if test="disabled != null">
      <if test="disabled != null and disabled !=''">
        disabled = #{disabled},
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        deleted = #{deleted},
      </if>
    </set>
pms-parent/pms-global/src/main/resources/mapper/BaUserRoleMapper.xml
@@ -20,18 +20,18 @@
    <!--@mbg.generated-->
    insert into ba_user_role
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="userId != null">
      <if test="userId != null and userId !=''">
        user_id,
      </if>
      <if test="roleId != null">
      <if test="roleId != null and roleId !=''">
        role_id,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="userId != null">
      <if test="userId != null and userId !=''">
        #{userId},
      </if>
      <if test="roleId != null">
      <if test="roleId != null and roleId !=''">
        #{roleId},
      </if>
    </trim>
pms-parent/pms-global/src/main/resources/mapper/OthFileMapper.xml
@@ -42,48 +42,48 @@
    <!--@mbg.generated-->
    insert into oth_file
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        id,
      </if>
      <if test="orgName != null">
      <if test="orgName!= null and orgName !=''">
        org_name,
      </if>
      <if test="extName != null">
      <if test="extName!= null and extName !=''">
        ext_name,
      </if>
      <if test="newName != null">
      <if test="newName!= null and newName !=''">
        new_name,
      </if>
      <if test="hash != null">
      <if test="hash!= null and hash !=''">
        hash,
      </if>
      <if test="filePath != null">
      <if test="filePath!= null and filePath !=''">
        file_path,
      </if>
      <if test="dt != null">
      <if test="dt != null and dt !=''">
        dt,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        #{id},
      </if>
      <if test="orgName != null">
      <if test="orgName!= null and orgName !=''">
        #{orgName},
      </if>
      <if test="extName != null">
      <if test="extName!= null and extName !=''">
        #{extName},
      </if>
      <if test="newName != null">
      <if test="newName!= null and newName !=''">
        #{newName},
      </if>
      <if test="hash != null">
      <if test="hash!= null and hash !=''">
        #{hash},
      </if>
      <if test="filePath != null">
      <if test="filePath!= null and filePath !=''">
        #{filePath},
      </if>
      <if test="dt != null">
      <if test="dt != null and dt !=''">
        #{dt},
      </if>
    </trim>
@@ -92,22 +92,22 @@
    <!--@mbg.generated-->
    update oth_file
    <set>
      <if test="orgName != null">
      <if test="orgName!= null and orgName !=''">
        org_name = #{orgName},
      </if>
      <if test="extName != null">
      <if test="extName!= null and extName !=''">
        ext_name = #{extName},
      </if>
      <if test="newName != null">
      <if test="newName!= null and newName !=''">
        new_name = #{newName},
      </if>
      <if test="hash != null">
      <if test="hash!= null and hash !=''">
        hash = #{hash},
      </if>
      <if test="filePath != null">
      <if test="filePath!= null and filePath !=''">
        file_path = #{filePath},
      </if>
      <if test="dt != null">
      <if test="dt != null and dt !=''">
        dt = #{dt},
      </if>
    </set>
pms-parent/pms-global/src/main/resources/mapper/PltMaterialMapper.xml
@@ -54,48 +54,48 @@
    <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">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="name != null">name,</if>
                <if test="type != null">type,</if>
                <if test="length != null">length,</if>
                <if test="factory != null">factory,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null">remark,</if>
                <if test="id != null and id !=''">id,</if>
                <if test="proId != null and proId !=''">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="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=INTEGER},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="name != null">#{name,jdbcType=VARCHAR},</if>
                <if test="type != null">#{type,jdbcType=VARCHAR},</if>
                <if test="length != null">#{length,jdbcType=VARCHAR},</if>
                <if test="factory != null">#{factory,jdbcType=VARCHAR},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
                <if test="id != null and id !=''">#{id,jdbcType=INTEGER},</if>
                <if test="proId != null and proId !=''">#{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="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">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="name != null">
                <if test="name != null and name !=''">
                    name = #{name,jdbcType=VARCHAR},
                </if>
                <if test="type != null">
                <if test="type != null and type !=''">
                    type = #{type,jdbcType=VARCHAR},
                </if>
                <if test="length != null">
                <if test="length!= null and length !=''">
                    length = #{length,jdbcType=VARCHAR},
                </if>
                <if test="factory != null">
                <if test="factory != null and factory !=''">
                    factory = #{factory,jdbcType=VARCHAR},
                </if>
                <if test="deleted != null">
                <if test="deleted != null and deleted !=''">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="remark != null">
                <if test="remark != null and remark !=''">
                    remark = #{remark,jdbcType=VARCHAR},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/PltProParamsMapper.xml
@@ -45,36 +45,36 @@
    <!--@mbg.generated-->
    insert into plt_product_params
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        id,
      </if>
      <if test="proId != null">
      <if test="proId != null and proId !=''">
        pro_id,
      </if>
      <if test="paramName != null">
      <if test="paramName!= null and paramName !=''">
        param_name,
      </if>
      <if test="paramValue != null">
      <if test="paramValue!= null and paramValue !=''">
        param_value,
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        deleted
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="proId != null">
      <if test="proId != null and proId !=''">
        #{proId,jdbcType=BIGINT},
      </if>
      <if test="paramName != null">
      <if test="paramName!= null and paramName !=''">
        #{paramName,jdbcType=VARCHAR},
      </if>
      <if test="paramValue != null">
      <if test="paramValue!= null and paramValue !=''">
        #{paramValue,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        #{deleted,jdbcType=TINYINT}
      </if>
    </trim>
@@ -83,16 +83,16 @@
    <!--@mbg.generated-->
    update plt_product_params
    <set>
      <if test="proId != null">
      <if test="proId != null and proId !=''">
        pro_id = #{proId,jdbcType=BIGINT},
      </if>
      <if test="paramName != null">
      <if test="paramName!= null and paramName !=''">
        param_name = #{paramName,jdbcType=VARCHAR},
      </if>
      <if test="paramValue != null">
      <if test="paramValue!= null and paramValue !=''">
        param_value = #{paramValue,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        deleted = #{deleted,jdbcType=TINYINT}
      </if>
    </set>
pms-parent/pms-global/src/main/resources/mapper/PltProductFileMapper.xml
@@ -39,28 +39,28 @@
    <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">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="fileId != null">file_id,</if>
                <if test="fileType != null">file_type,</if>
                <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="fileType != null and fileType !=''">file_type,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <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">#{fileType,jdbcType=VARCHAR},</if>
                <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="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">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="fileId != null">
                <if test="fileId != null and fileId !=''">
                    file_id = #{fileId,jdbcType=BIGINT},
                </if>
                <if test="fileType != null">
                <if test="fileType != null and fileType !=''">
                    file_type = #{fileType,jdbcType=VARCHAR},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/PltProductMapper.xml
@@ -53,66 +53,66 @@
    <!--@mbg.generated-->
    insert into plt_product
    <trim prefix="(" suffix=")" suffixOverrides=",">
        <if test="id != null">
        <if test="id != null and id !=''">
          id,
        </if>
        <if test="code != null">
        <if test="code != null and code !=''">
          `code`,
        </if>
        <if test="name != null">
        <if test="name != null and name !=''">
          `name`,
        </if>
        <if test="type != null">
        <if test="type != null and type !=''">
          `type`,
        </if>
        <if test="image != null">
        <if test="image!= null and image !=''">
          image,
        </if>
        <if test="director != null">
        <if test="director != null and director !=''">
          director,
        </if>
        <if test="dMobile != null">
        <if test="dMobile != null and dMobile !=''">
          d_mobile,
        </if>
        <if test="deleted != null">
        <if test="deleted != null and deleted !=''">
          deleted,
        </if>
        <if test="dt != null">
        <if test="dt != null and dt !=''">
          dt,
        </if>
        <if test="remark != null">
        <if test="remark != null and remark !=''">
          remark,
        </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
        <if test="id != null">
        <if test="id != null and id !=''">
          #{id,jdbcType=BIGINT},
        </if>
        <if test="code != null">
        <if test="code != null and code !=''">
          #{code,jdbcType=VARCHAR},
        </if>
        <if test="name != null">
        <if test="name != null and name !=''">
          #{name,jdbcType=VARCHAR},
        </if>
        <if test="type != null">
        <if test="type != null and type !=''">
          #{type,jdbcType=VARCHAR},
        </if>
        <if test="image != null">
        <if test="image!= null and image !=''">
          #{image,jdbcType=BIGINT},
        </if>
        <if test="director != null">
        <if test="director != null and director !=''">
          #{director,jdbcType=BIGINT},
        </if>
        <if test="dMobile != null">
        <if test="dMobile != null and dMobile !=''">
          #{dMobile,jdbcType=VARCHAR},
        </if>
        <if test="deleted != null">
        <if test="deleted != null and deleted !=''">
          #{deleted,jdbcType=VARCHAR },
        </if>
        <if test="dt != null">
        <if test="dt != null and dt !=''">
          #{dt,jdbcType=TIMESTAMP},
        </if>
        <if test="remark != null">
        <if test="remark != null and remark !=''">
          #{remark,jdbcType=VARCHAR},
        </if>
    </trim>
@@ -121,25 +121,25 @@
    <!--@mbg.generated-->
    update plt_product
    <set>
      <if test="name != null">
      <if test="name != null and name !=''">
        `name` = #{name,jdbcType=VARCHAR},
      </if>
      <if test="type != null">
      <if test="type != null and type !=''">
        `type` = #{type,jdbcType=VARCHAR},
      </if>
      <if test="image != null">
      <if test="image!= null and image !=''">
        image = #{image,jdbcType=BIGINT},
      </if>
      <if test="director != null">
      <if test="director != null and director !=''">
        director = #{director,jdbcType=BIGINT},
      </if>
      <if test="dMobile != null">
      <if test="dMobile != null and dMobile !=''">
        d_mobile = #{dMobile,jdbcType=VARCHAR},
      </if>
      <if test="dt != null">
      <if test="dt != null and dt !=''">
        dt = #{dt,jdbcType=TIMESTAMP},
      </if>
      <if test="remark != null">
      <if test="remark != null and remark !=''">
        remark = #{remark,jdbcType=VARCHAR},
      </if>
    </set>
@@ -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">
        <if test="id != null and id !=''">
            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">id,</if>
            <if test="proId != null">pro_id,</if>
            <if test="item != null">item,</if>
            <if test="sort != null">sort,</if>
            <if test="disabled != null">disabled,</if>
            <if test="deleted != null">deleted,</if>
            <if test="id != null and id !=''">id,</if>
            <if test="proId != null and proId !=''">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>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
            <if test="item != null">#{item,jdbcType=VARCHAR},</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>
            <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
            <if test="proId != null and proId !=''">#{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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems">
        update plt_product_quality_inspection_items
        <set>
            <if test="proId != null">
            <if test="proId != null and proId !=''">
                pro_id = #{proId,jdbcType=BIGINT},
            </if>
            <if test="disabled != null">
            <if test="disabled != null and disabled !=''">
                disabled = #{disabled,jdbcType=BIGINT},
            </if>
            <if test="item != null">
            <if test="item != null and item !=''">
                item = #{item,jdbcType=VARCHAR},
            </if>
            <if test="sort != null">
            <if test="sort != null and sort !=''">
                sort = #{sort,jdbcType=INTEGER},
            </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
@@ -42,36 +42,36 @@
    <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">id,</if>
            <if test="reason != null">reason,</if>
            <if test="proId != null">pro_id,</if>
            <if test="sort != null">sort,</if>
            <if test="deleted != null">deleted,</if>
            <if test="id != null and id !=''">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>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="reason != null">#{reason,jdbcType=VARCHAR},</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>
            <if test="id != null and id !=''">#{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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">
        update plt_product_scrapping_reason
        <set>
            <if test="reason != null">
            <if test="reason != null and reason !=''">
                reason = #{reason,jdbcType=VARCHAR},
            </if>
            <if test="proId != null">
            <if test="proId != null and proId !=''">
                pro_id = #{proId,jdbcType=VARCHAR},
            </if>
            <if test="sort != null">
            <if test="sort != null and sort !=''">
                sort = #{sort,jdbcType=INTEGER},
            </if>
            <if test="disabled != null">
            <if test="disabled != null and disabled !=''">
                disabled = #{disabled,jdbcType=TINYINT},
            </if>
            <if test="deleted != null">
            <if test="deleted != null and deleted !=''">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
@@ -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">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="item != null">item,</if>
                <if test="deleted != null">deleted,</if>
                <if test="disabled != null">disabled,</if>
                <if test="sort != null">sort,</if>
                <if test="id != null and id !=''">id,</if>
                <if test="proId != null and proId !=''">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>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="item != null">#{item,jdbcType=VARCHAR},</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>
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null and proId !=''">#{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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems">
        update plt_product_test_inspection_items
        <set>
                <if test="proId != null">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="item != null">
                <if test="item != null and item !=''">
                    item = #{item,jdbcType=VARCHAR},
                </if>
                <if test="deleted != null">
                <if test="deleted != null and deleted !=''">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="disabled != null">
                <if test="disabled != null and disabled !=''">
                    disabled = #{disabled,jdbcType=TINYINT},
                </if>
                <if test="sort != null">
                <if test="sort != null and sort !=''">
                    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">id,</if>
            <if test="reason != null">reason,</if>
            <if test="proId != null">pro_id,</if>
            <if test="sort != null">sort,</if>
            <if test="deleted != null">deleted,</if>
            <if test="id != null and id !=''">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>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="reason != null">#{reason,jdbcType=VARCHAR},</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>
                <if test="id != null and id !=''">#{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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductUnqualifiedReason">
        update plt_product_unqualified_reason
        <set>
            <if test="disabled != null">
            <if test="disabled != null and disabled !=''">
                disabled = #{disabled,jdbcType=TINYINT},
            </if>
            <if test="reason != null">
            <if test="reason != null and reason !=''">
                reason = #{reason,jdbcType=VARCHAR},
            </if>
            <if test="proId != null">
            <if test="proId != null and proId !=''">
                pro_id = #{proId,jdbcType=VARCHAR},
            </if>
            <if test="sort != null">
            <if test="sort != null and sort !=''">
                sort = #{sort,jdbcType=VARCHAR},
            </if>
            <if test="deleted != null">
            <if test="deleted != null and deleted !=''">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/PltProductionLineMapper.xml
@@ -51,56 +51,56 @@
    <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">id,</if>
                <if test="name != null">name,</if>
                <if test="type != null">type,</if>
                <if test="factory != null">factory,</if>
                <if test="director != null">director,</if>
                <if test="dMobile != null">d_mobile,</if>
                <if test="installTime != null">install_time,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null">remark,</if>
                <if test="id != null and id !=''">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="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="name != null">#{name,jdbcType=VARCHAR},</if>
                <if test="type != null">#{type,jdbcType=VARCHAR},</if>
                <if test="factory != null">#{factory,jdbcType=VARCHAR},</if>
                <if test="director != null">#{director,jdbcType=VARCHAR},</if>
                <if test="dMobile != null">#{dMobile,jdbcType=VARCHAR},</if>
                <if test="installTime != null">#{installTime,jdbcType=VARCHAR},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
                <if test="id != null and id !=''">#{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="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductionLine">
        update plt_production_line
        <set>
            <if test="name != null">
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR},
            </if>
            <if test="type != null">
            <if test="type != null and type !=''">
                type = #{type,jdbcType=VARCHAR},
            </if>
            <if test="factory != null">
            <if test="factory != null and factory !=''">
                factory = #{factory,jdbcType=VARCHAR},
            </if>
            <if test="director != null">
            <if test="director != null and director !=''">
                director = #{director,jdbcType=VARCHAR},
            </if>
            <if test="dMobile != null">
            <if test="dMobile != null and dMobile !=''">
                d_mobile = #{dMobile,jdbcType=VARCHAR},
            </if>
            <if test="installTime != null">
            <if test="installTime != null and installTime !=''">
                install_time = #{installTime,jdbcType=VARCHAR},
            </if>
            <if test="disabled != null">
            <if test="disabled != null and disabled !=''">
                disabled = #{disabled},
            </if>
            <if test="deleted != null">
            <if test="deleted != null and deleted !=''">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
            <if test="remark != null">
            <if test="remark != null and remark !=''">
                remark = #{remark,jdbcType=VARCHAR},
            </if>
        </set>
@@ -125,16 +125,16 @@
        <include refid="Base_Column_List" />
        from plt_production_line where deleted != 1
        <trim prefix="and" suffixOverrides="and">
            <if test="name != null">
            <if test="name != null and name !=''">
                name like concat('%', #{name}, '%') and
            </if>
            <if test="factory != null">
            <if test="factory != null and factory !=''">
                factory like concat('%', #{factory}, '%') and
            </if>
            <if test="director != null">
            <if test="director != null and director !=''">
                director like concat('%', #{director}, '%') and
            </if>
            <if test="dMobile != null">
            <if test="dMobile != null and dMobile !=''">
                d_mobile = #{dMobile,jdbcType=VARCHAR} and
            </if>
        </trim>
@@ -150,23 +150,23 @@
        select count(1)
        from plt_production_line where deleted != 1
        <trim prefix="and" suffixOverrides="and">
            <if test="name != null">
            <if test="name != null and name !=''">
                name like concat('%', #{name}, '%') and
            </if>
            <if test="factory != null">
            <if test="factory != null and factory !=''">
                factory like concat('%', #{factory}, '%') and
            </if>
            <if test="director != null">
            <if test="director != null and director !=''">
                director like concat('%', #{director}, '%') and
            </if>
            <if test="dMobile != null">
            <if test="dMobile != null and dMobile !=''">
                d_mobile = #{dMobile,jdbcType=VARCHAR} and
            </if>
        </trim>
    </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">
        <if test="id != null and id !=''">
            and id != #{id}
        </if>
    </select>
pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
@@ -41,40 +41,40 @@
    <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">id,</if>
                <if test="lineId != null">line_id,</if>
                <if test="code != null">code,</if>
                <if test="name != null">name,</if>
                <if test="remark != null">remark,</if>
                <if test="disabled != null">disabled,</if>
                <if test="deleted != null">deleted,</if>
                <if test="id != null and id !=''">id,</if>
                <if test="lineId != null and lineId !=''">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>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="lineId != null">#{lineId,jdbcType=VARCHAR},</if>
                <if test="code != null">#{code,jdbcType=VARCHAR},</if>
                <if test="name != null">#{name,jdbcType=VARCHAR},</if>
                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
                <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="lineId != null and lineId !=''">#{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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
        update plt_station
        <set>
            <if test="code != null">
            <if test="code != null and code !=''">
                code = #{code,jdbcType=VARCHAR},
            </if>
            <if test="name != null">
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR},
            </if>
            <if test="remark != null">
            <if test="remark != null and remark !=''">
                remark = #{remark,jdbcType=VARCHAR},
            </if>
            <if test="disabled != null">
            <if test="disabled != null and disabled !=''">
                disabled = #{disabled,jdbcType=TINYINT},
            </if>
            <if test="deleted != null">
            <if test="deleted != null and deleted !=''">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
        </set>
@@ -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">
            <if test="id != null and id !=''">
                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">
        <if test="id != null and id !=''">
            and process_id = #{id}
        </if>
    </select>
@@ -133,43 +133,43 @@
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="orderId != null">
            <if test="orderId!= null and orderId !=''">
                order_id = #{orderId,jdbcType=BIGINT} and
            </if>
            <if test="proId != null">
            <if test="proId != null and proId !=''">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <if test="batchId != null">
            <if test="batchId != null and batchId !=''">
                batch_id = #{batchId,jdbcType=BIGINT} and
            </if>
            <if test="processId != null">
            <if test="processId!= null and processId !=''">
                process_id = #{processId,jdbcType=BIGINT} and
            </if>
            <if test="name != null">
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR} and
            </if>
            <if test="number != null">
            <if test="number != null and number !=''">
                number = #{number,jdbcType=INTEGER} and
            </if>
            <if test="status != null">
            <if test="status != null and status !=''">
                status = #{status,jdbcType=TINYINT} and
            </if>
            <if test="creator != null">
            <if test="creator != null and creator !=''">
                creator = #{creator,jdbcType=VARCHAR} and
            </if>
            <if test="dt != null">
            <if test="dt != null and dt !=''">
                dt = #{dt,jdbcType=TIMESTAMP} and
            </if>
            <if test="startDate != null">
            <if test="startDate != null and startDate !=''">
                start_date = #{startDate,jdbcType=VARCHAR} and
            </if>
            <if test="endDate != null">
            <if test="endDate != null and endDate !=''">
                end_date = #{endDate,jdbcType=VARCHAR} and
            </if>
            <if test="deleted != null">
            <if test="deleted != null and deleted !=''">
                deleted = #{deleted,jdbcType=TINYINT} and
            </if>
            <if test="content != null">
            <if test="content != null and content !=''">
                content = #{content,jdbcType=VARCHAR} and
            </if>
        </trim>
@@ -180,43 +180,43 @@
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="orderId != null">
            <if test="orderId!= null and orderId !=''">
                order_id = #{orderId,jdbcType=BIGINT} and
            </if>
            <if test="proId != null">
            <if test="proId != null and proId !=''">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <if test="batchId != null">
            <if test="batchId != null and batchId !=''">
                batch_id = #{batchId,jdbcType=BIGINT} and
            </if>
            <if test="processId != null">
            <if test="processId!= null and processId !=''">
                process_id = #{processId,jdbcType=BIGINT} and
            </if>
            <if test="name != null">
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR} and
            </if>
            <if test="number != null">
            <if test="number != null and number !=''">
                number = #{number,jdbcType=INTEGER} and
            </if>
            <if test="status != null">
            <if test="status != null and status !=''">
                status = #{status,jdbcType=TINYINT} and
            </if>
            <if test="creator != null">
            <if test="creator != null and creator !=''">
                creator = #{creator,jdbcType=VARCHAR} and
            </if>
            <if test="dt != null">
            <if test="dt != null and dt !=''">
                dt = #{dt,jdbcType=TIMESTAMP} and
            </if>
            <if test="startDate != null">
            <if test="startDate != null and startDate !=''">
                start_date = #{startDate,jdbcType=VARCHAR} and
            </if>
            <if test="endDate != null">
            <if test="endDate != null and endDate !=''">
                end_date = #{endDate,jdbcType=VARCHAR} and
            </if>
            <if test="deleted != null">
            <if test="deleted != null and deleted !=''">
                deleted = #{deleted,jdbcType=TINYINT} and
            </if>
            <if test="content != null">
            <if test="content != null and content !=''">
                content = #{content,jdbcType=VARCHAR} and
            </if>
        </trim>
@@ -247,88 +247,88 @@
            useGeneratedKeys="true">
        insert into pr_assembly_plan
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <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">name,</if>
            <if test="number != null">number,</if>
            <if test="status != null">status,</if>
            <if test="creator != null">creator,</if>
            <if test="dt != null">dt,</if>
            <if test="startDate != null">start_date,</if>
            <if test="endDate != null">end_date,</if>
            <if test="deleted != null">deleted,</if>
            <if test="content != null">content,</if>
            <if test="inputNumber != null">input_number,</if>
            <if test="outputNumber != null">output_number,</if>
            <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="name != null and name !=''">name,</if>
            <if test="number != null and number !=''">number,</if>
            <if test="status != null and status !=''">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="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">#{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">#{name,jdbcType=VARCHAR},</if>
            <if test="number != null">#{number,jdbcType=INTEGER},</if>
            <if test="status != null">#{status,jdbcType=TINYINT},</if>
            <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
            <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
            <if test="startDate != null">#{startDate,jdbcType=VARCHAR},</if>
            <if test="endDate != null">#{endDate,jdbcType=VARCHAR},</if>
            <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
            <if test="content != null">#{content,jdbcType=VARCHAR},</if>
            <if test="inputNumber != null">#{inputNumber,jdbcType=INTEGER},</if>
            <if test="outputNumber != null">#{outputNumber,jdbcType=INTEGER},</if>
            <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="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="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="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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
        update pr_assembly_plan
        <set>
            <if test="orderId != null">
            <if test="orderId!= null and orderId !=''">
                order_id = #{orderId,jdbcType=BIGINT} ,
            </if>
            <if test="proId != null">
            <if test="proId != null and proId !=''">
                pro_id = #{proId,jdbcType=BIGINT},
            </if>
            <if test="batchId != null">
            <if test="batchId != null and batchId !=''">
                batch_id = #{batchId,jdbcType=BIGINT},
            </if>
            <if test="processId != null">
            <if test="processId!= null and processId !=''">
                process_id = #{processId,jdbcType=BIGINT},
            </if>
            <if test="name != null">
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR},
            </if>
            <if test="number != null">
            <if test="number != null and number !=''">
                number = #{number,jdbcType=INTEGER},
            </if>
            <if test="status != null">
            <if test="status != null and status !=''">
                status = #{status,jdbcType=TINYINT},
            </if>
            <if test="creator != null">
            <if test="creator != null and creator !=''">
                creator = #{creator,jdbcType=VARCHAR},
            </if>
            <if test="dt != null">
            <if test="dt != null and dt !=''">
                dt = #{dt,jdbcType=TIMESTAMP},
            </if>
            <if test="startDate != null">
            <if test="startDate != null and startDate !=''">
                start_date = #{startDate,jdbcType=VARCHAR},
            </if>
            <if test="endDate != null">
            <if test="endDate != null and endDate !=''">
                end_date = #{endDate,jdbcType=VARCHAR},
            </if>
            <if test="deleted != null">
            <if test="deleted != null and deleted !=''">
                deleted = #{deleted,jdbcType=TINYINT},
            </if>
            <if test="content != null">
            <if test="content != null and content !=''">
                content = #{content,jdbcType=VARCHAR},
            </if>
            <if test="inputNumber != null">
            <if test="inputNumber!= null and inputNumber !=''">
                input_number = #{inputNumber,jdbcType=INTEGER},
            </if>
            <if test="outputNumber != null">
            <if test="outputNumber!= null and outputNumber !=''">
                output_number = #{outputNumber,jdbcType=INTEGER},
            </if>
        </set>
@@ -360,7 +360,7 @@
        <include refid="Base_Column_List"/>
        from pr_assembly_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null">
            <if test="proId != null and proId !=''">
                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">
            <if test="proId != null and proId !=''">
                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">
        <if test="id != null and id !=''">
            and id != #{id,jdbcType=BIGINT}
        </if>
    </select>
pms-parent/pms-global/src/main/resources/mapper/PrBatchNumberMapper.xml
@@ -45,38 +45,38 @@
    <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">id,</if>
                <if test="batchNumber != null">batch_number,</if>
                <if test="proId != null">pro_id,</if>
                <if test="creator != null">creator,</if>
                <if test="dt != null">dt,</if>
                <if test="remark != null">remark,</if>
                <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="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">#{id,jdbcType=BIGINT},</if>
                <if test="batchNumber != null">#{batchNumber,jdbcType=INTEGER},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
                <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="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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrBatchNumber">
        update pr_batch_number
        <set>
                <if test="batchNumber != null">
                <if test="batchNumber!= null and batchNumber !=''">
                    batch_number = #{batchNumber,jdbcType=INTEGER},
                </if>
                <if test="proId != null">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="creator != null">
                <if test="creator != null and creator !=''">
                    creator = #{creator,jdbcType=VARCHAR},
                </if>
                <if test="dt != null">
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="remark != null">
                <if test="remark != null and remark !=''">
                    remark = #{remark,jdbcType=VARCHAR},
                </if>
        </set>
@@ -98,22 +98,22 @@
        <include refid="Base_Column_List" />
        from pr_batch_number
        <trim prefix="where" suffixOverrides="and">
                <if test="id != null">
                <if test="id != null and id !=''">
                    id = #{id,jdbcType=BIGINT} and
                </if>
                <if test="batchNumber != null">
                <if test="batchNumber!= null and batchNumber !=''">
                    batch_number = #{batchNumber,jdbcType=INTEGER} and
                </if>
                <if test="proId != null">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT} and
                </if>
                <if test="creator != null">
                <if test="creator != null and creator !=''">
                    creator = #{creator,jdbcType=VARCHAR} and
                </if>
                <if test="dt != null">
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP} and
                </if>
                <if test="remark != null">
                <if test="remark != null and remark !=''">
                    remark = #{remark,jdbcType=VARCHAR} and
                </if>
        </trim>
@@ -129,22 +129,22 @@
        select count(1)
        from pr_batch_number
        <trim prefix="where" suffixOverrides="and">
                <if test="id != null">
                <if test="id != null and id !=''">
                    id = #{id,jdbcType=BIGINT} and
                </if>
                <if test="batchNumber != null">
                <if test="batchNumber!= null and batchNumber !=''">
                    batch_number = #{batchNumber,jdbcType=INTEGER} and
                </if>
                <if test="proId != null">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT} and
                </if>
                <if test="creator != null">
                <if test="creator != null and creator !=''">
                    creator = #{creator,jdbcType=VARCHAR} and
                </if>
                <if test="dt != null">
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP} and
                </if>
                <if test="remark != null">
                <if test="remark != null and remark !=''">
                    remark = #{remark,jdbcType=VARCHAR} and
                </if>
        </trim>
pms-parent/pms-global/src/main/resources/mapper/PrDevOpsPlanMapper.xml
@@ -50,53 +50,53 @@
    <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">id,</if>
                <if test="name != null">name,</if>
                <if test="status != null">status,</if>
                <if test="creator != null">creator,</if>
                <if test="dt != null">dt,</if>
                <if test="startDate != null">start_date,</if>
                <if test="endDate != null">end_date,</if>
                <if test="deleted != null">deleted,</if>
                <if test="content != null">content,</if>
                <if test="id != null and id !=''">id,</if>
                <if test="name != null and name !=''">name,</if>
                <if test="status != null and status !=''">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="content != null and content !=''">content,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="name != null">#{name,jdbcType=VARCHAR},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="startDate != null">#{startDate,jdbcType=VARCHAR},</if>
                <if test="endDate != null">#{endDate,jdbcType=VARCHAR},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="content != null">#{content,jdbcType=VARCHAR},</if>
                <if test="id != null and id !=''">#{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="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="content != null and content !=''">#{content,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrDevOpsPlan">
        update pr_dev_ops_plan
        <set>
                <if test="name != null">
                <if test="name != null and name !=''">
                    name = #{name,jdbcType=VARCHAR},
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="creator != null">
                <if test="creator != null and creator !=''">
                    creator = #{creator,jdbcType=VARCHAR},
                </if>
                <if test="dt != null">
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="startDate != null">
                <if test="startDate != null and startDate !=''">
                    start_date = #{startDate,jdbcType=VARCHAR},
                </if>
                <if test="endDate != null">
                <if test="endDate != null and endDate !=''">
                    end_date = #{endDate,jdbcType=VARCHAR},
                </if>
                <if test="deleted != null">
                <if test="deleted != null and deleted !=''">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="content != null">
                <if test="content != null and content !=''">
                    content = #{content,jdbcType=VARCHAR},
                </if>
        </set>
@@ -121,10 +121,10 @@
        <include refid="Base_Column_List" />
        from pr_dev_ops_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="name != null">
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR} and
            </if>
            <if test="status != null">
            <if test="status != null and status !=''">
                status = #{status,jdbcType=TINYINT} and
            </if>
            <if test="startDate != null and startDate != '' ">
@@ -146,10 +146,10 @@
        select count(1)
        from pr_dev_ops_plan
        <trim prefix="where" suffixOverrides="and">
            <if test="name != null">
            <if test="name != null and name !=''">
                name = #{name,jdbcType=VARCHAR} and
            </if>
            <if test="status != null">
            <if test="status != null and status !=''">
                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">
        <if test="id != null and id !=''">
            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">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="batchId != null">batch_id,</if>
                <if test="deviceNo != null">device_no,</if>
                <if test="status != null">status,</if>
                <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="deviceNo != null and deviceNo !=''">device_no,</if>
                <if test="status != null and status !=''">status,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <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">#{deviceNo},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <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="deviceNo != null and deviceNo !=''">#{deviceNo},</if>
                <if test="status != null and status !=''">#{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">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="batchId != null">
                <if test="batchId != null and batchId !=''">
                    batch_id = #{batchId,jdbcType=BIGINT},
                </if>
                <if test="deviceNo != null">
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo},
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    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">
                <if test="id != null and id !=''">
                    id = #{id,jdbcType=BIGINT} and
                </if>
                <if test="proId != null">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT} and
                </if>
                <if test="batchId != null">
                <if test="batchId != null and batchId !=''">
                    batch_id = #{batchId,jdbcType=BIGINT} and
                </if>
                <if test="deviceNo != null">
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=BIGINT} and
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    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">
                <if test="id != null and id !=''">
                    id = #{id,jdbcType=BIGINT} and
                </if>
                <if test="proId != null">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT} and
                </if>
                <if test="batchId != null">
                <if test="batchId != null and batchId !=''">
                    batch_id = #{batchId,jdbcType=BIGINT} and
                </if>
                <if test="deviceNo != null">
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=BIGINT} and
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    status = #{status,jdbcType=TINYINT} and
                </if>
        </trim>
pms-parent/pms-global/src/main/resources/mapper/PrOrderItemMapper.xml
@@ -49,39 +49,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">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>
                <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>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <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>
                <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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrderItem">
        <!--@mbg.generated-->
        update pr_order_item
        <set>
                <if test="orderId != null">
                <if test="orderId!= null and orderId !=''">
                    order_id = #{orderId,jdbcType=BIGINT},
                </if>
                <if test="proId != null">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="number != null">
                <if test="number != null and number !=''">
                    number = #{number,jdbcType=INTEGER},
                </if>
                <if test="completeNumber != null">
                <if test="completeNumber!= null and completeNumber !=''">
                    complete_number = #{completeNumber,jdbcType=INTEGER},
                </if>
                <if test="deleted != null">
                <if test="deleted != null and deleted !=''">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
        </set>
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">
        <if test="id != null and id !=''">
            and id != #{id}
        </if>
    </select>
@@ -148,68 +148,68 @@
    <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">id,</if>
                <if test="name != null">name,</if>
                <if test="customerName != null">customer_name,</if>
                <if test="projectName != null">project_name,</if>
                <if test="director != null">director,</if>
                <if test="dMobile != null">d_mobile,</if>
                <if test="deliveryDate != null">delivery_date,</if>
                <if test="status != null">status,</if>
                <if test="creator != null">creator,</if>
                <if test="dt != null">dt,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null">remark,</if>
                <if test="id != null and id !=''">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>
                <if test="director != null and director !=''">director,</if>
                <if test="dMobile != null and dMobile !=''">d_mobile,</if>
                <if test="deliveryDate!= null and deliveryDate !=''">delivery_date,</if>
                <if test="status != null and status !=''">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="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="name != null">#{name,jdbcType=VARCHAR},</if>
                <if test="customerName != null">#{customerName,jdbcType=VARCHAR},</if>
                <if test="projectName != null">#{projectName,jdbcType=VARCHAR},</if>
                <if test="director != null">#{director,jdbcType=VARCHAR},</if>
                <if test="dMobile != null">#{dMobile,jdbcType=VARCHAR},</if>
                <if test="deliveryDate != null">#{deliveryDate,jdbcType=VARCHAR},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
                <if test="id != null and id !=''">#{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>
                <if test="director != null and director !=''">#{director,jdbcType=VARCHAR},</if>
                <if test="dMobile != null and dMobile !=''">#{dMobile,jdbcType=VARCHAR},</if>
                <if test="deliveryDate!= null and deliveryDate !=''">#{deliveryDate,jdbcType=VARCHAR},</if>
                <if test="status != null and status !=''">#{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="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrOrder">
        update pr_order
        <set>
                <if test="name != null">
                <if test="name != null and name !=''">
                    name = #{name,jdbcType=VARCHAR},
                </if>
                <if test="customerName != null">
                <if test="customerName!= null and customerName !=''">
                    customer_name = #{customerName,jdbcType=VARCHAR},
                </if>
                <if test="projectName != null">
                <if test="projectName!= null and projectName !=''">
                    project_name = #{projectName,jdbcType=VARCHAR},
                </if>
                <if test="director != null">
                <if test="director != null and director !=''">
                    director = #{director,jdbcType=VARCHAR},
                </if>
                <if test="dMobile != null">
                <if test="dMobile != null and dMobile !=''">
                    d_mobile = #{dMobile,jdbcType=VARCHAR},
                </if>
                <if test="deliveryDate != null">
                <if test="deliveryDate!= null and deliveryDate !=''">
                    delivery_date = #{deliveryDate,jdbcType=VARCHAR},
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="creator != null">
                <if test="creator != null and creator !=''">
                    creator = #{creator,jdbcType=VARCHAR},
                </if>
                <if test="dt != null">
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="deleted != null">
                <if test="deleted != null and deleted !=''">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="remark != null">
                <if test="remark != null and remark !=''">
                    remark = #{remark,jdbcType=VARCHAR},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml
@@ -59,30 +59,30 @@
    <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">id,</if>
                <if test="processId != null">process_id,</if>
                <if test="sort != null">sort,</if>
                <if test="content != null">content,</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">device_cycle_content,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null">remark,</if>
                <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="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="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
                <if test="deleted != null and deleted !=''">deleted,</if>
                <if test="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
                <if test="sort != null">#{sort,jdbcType=INTEGER},</if>
                <if test="content != null">#{content,jdbcType=VARCHAR},</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">#{deviceCycleContent,jdbcType=VARCHAR},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
                <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="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="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
@@ -110,34 +110,34 @@
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionNode">
        update pr_production_node
        <set>
                <if test="processId != null">
                <if test="isEnd!= null and isEnd !=''">
                    process_id = #{processId,jdbcType=BIGINT},
                </if>
                <if test="sort != null">
                <if test="sort != null and sort !=''">
                    sort = #{sort,jdbcType=INTEGER},
                </if>
                <if test="content != null">
                <if test="content != null and content !=''">
                    content = #{content,jdbcType=VARCHAR},
                </if>
                <if test="nodeType != null">
                <if test="nodeType!= null and nodeType !=''">
                    node_type = #{nodeType,jdbcType=INTEGER},
                </if>
                <if test="isStart != null">
                <if test="isStart!= null and isStart !=''">
                    is_start = #{isStart,jdbcType=TINYINT},
                </if>
                <if test="isEnd != null">
                <if test="isEnd!= null and isEnd !=''">
                    is_end = #{isEnd,jdbcType=TINYINT},
                </if>
                <if test="isRecord != null">
                <if test="isRecord!= null and isRecord !=''">
                    is_record = #{isRecord,jdbcType=TINYINT},
                </if>
                <if test="deviceCycleContent != null">
                <if test="deviceCycleContent != null and deviceCycleContent !=''">
                    device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
                </if>
                <if test="deleted != null">
                <if test="deleted != null and deleted !=''">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="remark != null">
                <if test="remark != null and remark !=''">
                    remark = #{remark,jdbcType=VARCHAR},
                </if>
        </set>
@@ -149,7 +149,7 @@
        <include refid="Base_Column_List" />
        from pr_production_node
        <trim prefix="where" suffixOverrides="and">
            <if test="processId != null">
            <if test="processId!= null and processId !=''">
                process_id = #{processId,jdbcType=BIGINT} and
            </if>
        </trim>
pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -76,48 +76,48 @@
    <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">id,</if>
                <if test="proId != null">pro_id,</if>
                <if test="name != null">name,</if>
                <if test="creator != null">creator,</if>
                <if test="dt != null">dt,</if>
                <if test="disabled != null">disabled,</if>
                <if test="deleted != null">deleted,</if>
                <if test="remark != null">remark,</if>
                <if test="id != null and id !=''">id,</if>
                <if test="proId != null and proId !=''">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="remark != null and remark !=''">remark,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                <if test="name != null">#{name,jdbcType=VARCHAR},</if>
                <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
                <if test="proId != null and proId !=''">#{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="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">
                <if test="proId != null and proId !=''">
                    pro_id = #{proId,jdbcType=BIGINT},
                </if>
                <if test="name != null">
                <if test="name != null and name !=''">
                    name = #{name,jdbcType=VARCHAR},
                </if>
                <if test="creator != null">
                <if test="creator != null and creator !=''">
                    creator = #{creator,jdbcType=VARCHAR},
                </if>
                <if test="dt != null">
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="disabled != null">
                <if test="disabled != null and disabled !=''">
                    disabled = #{disabled,jdbcType=TINYINT},
                </if>
                <if test="deleted != null">
                <if test="deleted != null and deleted !=''">
                    deleted = #{deleted,jdbcType=TINYINT},
                </if>
                <if test="remark != null">
                <if test="remark != null and remark !=''">
                    remark = #{remark,jdbcType=VARCHAR},
                </if>
        </set>
@@ -129,10 +129,10 @@
        <include refid="Base_Column_List" />
        from pr_production_process t
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null">
            <if test="proId != null and proId !=''">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
<!--            <if test="name != null">-->
<!--            <if test="name != null and name !=''">-->
<!--                name = #{name,jdbcType=VARCHAR} and-->
<!--            </if>-->
        </trim>
@@ -148,10 +148,10 @@
        select count(1)
        from pr_production_process t
        <trim prefix="where" suffixOverrides="and">
            <if test="proId != null">
            <if test="proId != null and proId !=''">
                pro_id = #{proId,jdbcType=BIGINT} and
            </if>
            <!--            <if test="name != null">-->
            <!--            <if test="name != null and name !=''">-->
            <!--                name = #{name,jdbcType=VARCHAR} and-->
            <!--            </if>-->
        </trim>
@@ -169,7 +169,7 @@
        select count(1)
        from pr_production_process
        where name = #{name} and deleted = 0
        <if test="id != null">
        <if test="id != null and id !=''">
            and id != #{id}
        </if>
    </select>
pms-parent/pms-global/src/main/resources/mapper/PrScheduleMapper.xml
@@ -41,36 +41,36 @@
    <!--@mbg.generated-->
    insert into pr_schedule
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        id,
      </if>
      <if test="userId != null">
      <if test="userId != null and userId !=''">
        user_id,
      </if>
      <if test="scheduleDate != null">
      <if test="scheduleDate != null and scheduleDate !=''">
        schedule_date,
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        deleted,
      </if>
      <if test="dt != null">
      <if test="dt != null and dt !=''">
        dt,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="userId != null">
      <if test="userId != null and userId !=''">
        #{userId,jdbcType=BIGINT},
      </if>
      <if test="scheduleDate != null">
      <if test="scheduleDate != null  and scheduleDate !=''">
        #{scheduleDate,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        #{deleted,jdbcType=TINYINT},
      </if>
      <if test="dt != null">
      <if test="dt != null and dt !=''">
        #{dt,jdbcType=TIMESTAMP},
      </if>
    </trim>
@@ -79,13 +79,13 @@
    <!--@mbg.generated-->
    update pr_schedule
    <set>
      <if test="userId != null">
      <if test="userId != null and userId !=''">
        user_id = #{userId,jdbcType=BIGINT},
      </if>
      <if test="scheduleDate != null">
      <if test="scheduleDate != null  and scheduleDate !=''">
        schedule_date = #{scheduleDate,jdbcType=VARCHAR},
      </if>
      <if test="deleted != null">
      <if test="deleted != null and deleted !=''">
        deleted = #{deleted,jdbcType=TINYINT},
      </if>
    </set>
@@ -104,10 +104,10 @@
    select count(1)
    from pr_schedule
    where deleted = 0
    <if test="userId != null">
    <if test="userId != null and userId !=''">
      and user_id = #{userId,jdbcType=BIGINT}
    </if>
    <if test="scheduleDate != null">
    <if test="scheduleDate != null  and scheduleDate !=''">
      and schedule_date = #{scheduleDate,jdbcType=VARCHAR}
    </if>
  </select>
@@ -117,10 +117,10 @@
    <include refid="Base_Column_List" />
    from pr_schedule
    where deleted = 0
    <if test="userId != null">
    <if test="userId != null and userId !=''">
      and user_id = #{userId}
    </if>
    <if test="scheduleDate != null">
    <if test="scheduleDate != null  and scheduleDate !=''">
      and schedule_date = #{scheduleDate}
    </if>
  </select>
@@ -130,10 +130,10 @@
    <include refid="Base_Column_List" />
    from pr_schedule
    where deleted = 0
    <if test="userId != null">
    <if test="userId != null  and userId !=''">
      and user_id = #{userId}
    </if>
    <if test="scheduleDate != null">
    <if test="scheduleDate != null  and scheduleDate !=''">
      and schedule_date = #{scheduleDate}
    </if>
    order by schedule_date desc
pms-parent/pms-global/src/main/resources/mapper/PrScheduleRelMapper.xml
@@ -46,42 +46,42 @@
    <!--@mbg.generated-->
    insert into pr_schedule_rel
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        id,
      </if>
      <if test="scheduleId != null">
      <if test="scheduleId!= null and scheduleId !=''">
        schedule_id,
      </if>
      <if test="planId != null">
      <if test="planId != null and planId !=''">
        plan_id,
      </if>
      <if test="nodeId != null">
      <if test="nodeId!= null and nodeId !=''">
        node_id,
      </if>
      <if test="stationId != null">
      <if test="stationId != null and stationId !=''">
        station_id,
      </if>
      <if test="workDetails != null">
      <if test="workDetails!= null and workDetails !=''">
        work_details,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
      <if test="id != null and id !=''">
        #{id,jdbcType=BIGINT},
      </if>
      <if test="scheduleId != null">
      <if test="scheduleId!= null and scheduleId !=''">
        #{scheduleId,jdbcType=BIGINT},
      </if>
      <if test="planId != null">
      <if test="planId != null and planId !=''">
        #{planId,jdbcType=BIGINT},
      </if>
      <if test="nodeId != null">
      <if test="nodeId!= null and nodeId !=''">
        #{nodeId,jdbcType=BIGINT},
      </if>
      <if test="stationId != null">
      <if test="stationId != null and stationId !=''">
        #{stationId,jdbcType=BIGINT},
      </if>
      <if test="workDetails != null">
      <if test="workDetails!= null and workDetails !=''">
        #{workDetails,jdbcType=VARCHAR},
      </if>
    </trim>
@@ -90,19 +90,19 @@
    <!--@mbg.generated-->
    update pr_schedule_rel
    <set>
      <if test="scheduleId != null">
      <if test="scheduleId!= null and scheduleId !=''">
        schedule_id = #{scheduleId,jdbcType=BIGINT},
      </if>
      <if test="planId != null">
      <if test="planId != null and planId !=''">
        plan_id = #{planId,jdbcType=BIGINT},
      </if>
      <if test="nodeId != null">
      <if test="nodeId!= null and nodeId !=''">
        node_id = #{nodeId,jdbcType=BIGINT},
      </if>
      <if test="stationId != null">
      <if test="stationId != null and stationId !=''">
        station_id = #{stationId,jdbcType=BIGINT},
      </if>
      <if test="workDetails != null">
      <if test="workDetails!= null and workDetails !=''">
        work_details = #{workDetails,jdbcType=VARCHAR},
      </if>
    </set>
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">id,</if>
                <if test="nodeId != null">node_id,</if>
                <if test="fileId != null">file_id,</if>
                <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>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="nodeId != null">#{nodeId,jdbcType=BIGINT},</if>
                <if test="fileId != null">#{fileId,jdbcType=BIGINT},</if>
                <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>
        </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">
                <if test="nodeId!= null and nodeId !=''">
                    node_id = #{nodeId,jdbcType=BIGINT},
                </if>
                <if test="fileId != null">
                <if test="fileId != null and fileId !=''">
                    file_id = #{fileId,jdbcType=BIGINT},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
@@ -54,73 +54,73 @@
    <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">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">dt,</if>
                <if test="status != null">status,</if>
                <if test="startTime != null">start_time,</if>
                <if test="endTime != null">end_time,</if>
                <if test="assistants != null">assistants,</if>
                <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="dt != null and dt !=''">dt,</if>
                <if test="status != null and status !=''">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">#{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">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
                <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
                <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="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="status != null and status !=''">#{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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
        update sta_assembly_work_history
        <set>
                <if test="workId != null">
                <if test="workId != null and workId !=''">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="userId != null">
                <if test="userId != null and userId !=''">
                    user_id = #{userId,jdbcType=BIGINT},
                </if>
                <if test="lineId != null">
                <if test="lineId != null and lineId !=''">
                    line_id = #{lineId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                <if test="stationId != null and stationId !=''">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="planId != null">
                <if test="planId != null and planId !=''">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="processId != null">
                <if test="processId!= null and processId !=''">
                    process_id = #{processId,jdbcType=BIGINT},
                </if>
                <if test="nodeId != null">
                <if test="nodeId!= null and nodeId !=''">
                    node_id = #{nodeId,jdbcType=BIGINT},
                </if>
                <if test="dt != null">
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="startTime != null">
                <if test="startTime != null and startTime !=''">
                    start_time = #{startTime,jdbcType=TIMESTAMP},
                </if>
                <if test="endTime != null">
                <if test="endTime != null and endTime !=''">
                    end_time = #{endTime,jdbcType=TIMESTAMP},
                </if>
                <if test="assistants != null">
                <if test="assistants != null and assistants !=''">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -198,10 +198,10 @@
            <if test="lineName != null and lineName != '' ">
                and ll.name like concat('%', #{lineName}, '%')
            </if>
            <if test="startTime != null">
            <if test="startTime != null and startTime !=''">
                and l.start_time <![CDATA[ > ]]> #{startTime}
            </if>
            <if test="endTime != null">
            <if test="endTime != null and endTime !=''">
                and l.start_time <![CDATA[ < ]]> #{endTime}
            </if>
            <if test="userId != null and userId !=''">
@@ -265,10 +265,10 @@
            <if test="lineName != null and lineName != '' ">
                and ll.name like concat('%', #{lineName}, '%')
            </if>
            <if test="startTime != null">
            <if test="startTime != null and startTime !=''">
                and l.start_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
            </if>
            <if test="endTime != null">
            <if test="endTime != null and endTime !=''">
                and l.start_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
            </if>
            <if test="userId != null and userId !=''">
@@ -304,7 +304,7 @@
        where user_id = #{userId,jdbcType=BIGINT}
        and station_id = #{stationId,jdbcType=BIGINT}
        <choose>
            <when test="planId != null">
            <when test="planId != null and planId !=''">
                and plan_id = #{planId,jdbcType=BIGINT}
            </when>
            <otherwise>
@@ -312,7 +312,7 @@
            </otherwise>
        </choose>
        <choose>
            <when test="processId != null">
            <when test="processId != null and processId !=''">
                and process_id = #{processId,jdbcType=BIGINT}
            </when>
            <otherwise>
@@ -320,7 +320,7 @@
            </otherwise>
        </choose>
        <choose>
            <when test="nodeId != null">
            <when test="nodeId != null and nodeId !=''">
                and node_id = #{nodeId,jdbcType=BIGINT}
            </when>
            <otherwise>
@@ -328,7 +328,7 @@
            </otherwise>
        </choose>
        and work_type = #{workType,jdbcType=TINYINT}
        <if test="id != null">
        <if test="id != null and id !=''">
            and id != #{id,jdbcType=BIGINT}
        </if>
    </select>
@@ -354,73 +354,73 @@
            parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
        insert into sta_assembly_work_last
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <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">dt,</if>
            <if test="status != null">status,</if>
            <if test="startTime != null">start_time,</if>
            <if test="endTime != null">end_time,</if>
            <if test="assistants != null">assistants,</if>
            <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="dt != null and dt !=''">dt,</if>
            <if test="status != null and status !=''">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">#{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">#{dt,jdbcType=TIMESTAMP},</if>
            <if test="status != null">#{status,jdbcType=TINYINT},</if>
            <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
            <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
            <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
            <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="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
            <if test="status != null and status !=''">#{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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
        update sta_assembly_work_last
        <set>
            <if test="userId != null">
            <if test="userId != null and userId !=''">
                user_id = #{userId,jdbcType=BIGINT},
            </if>
            <if test="lineId != null">
            <if test="lineId != null and lineId !=''">
                line_id = #{lineId,jdbcType=BIGINT},
            </if>
            <if test="stationId != null">
            <if test="stationId != null and stationId !=''">
                station_id = #{stationId,jdbcType=BIGINT},
            </if>
            <if test="planId != null">
            <if test="planId != null and planId !=''">
                plan_id = #{planId,jdbcType=BIGINT},
            </if>
            <if test="processId != null">
            <if test="processId!= null and processId !=''">
                process_id = #{processId,jdbcType=BIGINT},
            </if>
            <if test="nodeId != null">
            <if test="nodeId!= null and nodeId !=''">
                node_id = #{nodeId,jdbcType=BIGINT},
            </if>
            <if test="workType != null">
            <if test="workType!= null and workType !=''">
                work_type = #{workType,jdbcType=TINYINT},
            </if>
            <if test="dt != null">
            <if test="dt != null and dt !=''">
                dt = #{dt,jdbcType=TIMESTAMP},
            </if>
            <if test="status != null">
            <if test="status != null and status !=''">
                status = #{status,jdbcType=TINYINT},
            </if>
            <if test="startTime != null">
            <if test="startTime != null and startTime !=''">
                start_time = #{startTime,jdbcType=TIMESTAMP},
            </if>
            <if test="endTime != null">
            <if test="endTime != null and endTime !=''">
                end_time = #{endTime,jdbcType=TIMESTAMP},
            </if>
            <if test="assistants != null">
            <if test="assistants != null and assistants !=''">
                assistants = #{assistants,jdbcType=VARCHAR},
            </if>
        </set>
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">id,</if>
                <if test="userId != null">user_id,</if>
                <if test="planId != null">plan_id,</if>
                <if test="dt != null">dt,</if>
                <if test="status != null">status,</if>
                <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="dt != null and dt !=''">dt,</if>
                <if test="status != null and status !=''">status,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <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">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <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="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
                <if test="status != null and status !=''">#{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">
                <if test="userId != null and userId !=''">
                    user_id = #{userId,jdbcType=BIGINT},
                </if>
                <if test="planId != null">
                <if test="planId != null and planId !=''">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="dt != null">
                <if test="dt != null and dt !=''">
                    dt = #{dt,jdbcType=TIMESTAMP},
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    status = #{status,jdbcType=TINYINT},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -86,103 +86,103 @@
    <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">id,</if>
            <if test="deviceNo != null">device_no,</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">node_content,</if>
            <if test="deviceCycleContent != null">device_cycle_content,</if>
            <if test="status != null">status,</if>
            <if test="result != null">result,</if>
            <if test="errorMsg != null">error_msg,</if>
            <if test="assistants != null">assistants,</if>
            <if test="updatedBy != null">updated_by,</if>
            <if test="inTime != null">in_time,</if>
            <if test="outTime != null">out_time,</if>
            <if test="inLineTime != null">in_line_time,</if>
            <if test="outLineTime != null">out_line_time,</if>
            <if test="memo != null">memo,</if>
            <if test="id != null and id !=''">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="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="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="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>
            <if test="outLineTime != null and outLineTime !=''">out_line_time,</if>
            <if test="memo != null and memo !=''">memo,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</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">#{nodeContent,jdbcType=VARCHAR},</if>
            <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
            <if test="status != null">#{status,jdbcType=TINYINT},</if>
            <if test="result != null">#{result,jdbcType=TINYINT},</if>
            <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
            <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
            <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
            <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
            <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
            <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
            <if test="outLineTime != null">#{outLineTime,jdbcType=TIMESTAMP},</if>
            <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
            <if test="id != null and id !=''">#{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="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="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="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>
            <if test="outLineTime != null and outLineTime !=''">#{outLineTime,jdbcType=TIMESTAMP},</if>
            <if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
        update sta_device_last
        <set>
            <if test="deviceNo != null">
            <if test="deviceNo != null and deviceNo !=''">
                device_no = #{deviceNo,jdbcType=VARCHAR},
            </if>
            <if test="workId != null">
            <if test="workId != null and workId !=''">
                work_id = #{workId,jdbcType=BIGINT},
            </if>
            <if test="repairId != null">
            <if test="repairId != null and repairId !=''">
                repair_id = #{repairId,jdbcType=BIGINT},
            </if>
            <if test="planId != null">
            <if test="planId != null and planId !=''">
                plan_id = #{planId,jdbcType=BIGINT},
            </if>
            <if test="stationId != null">
            <if test="stationId != null and stationId !=''">
                station_id = #{stationId,jdbcType=BIGINT},
            </if>
            <if test="currNode != null">
            <if test="currNode != null and currNode !=''">
                curr_node = #{currNode,jdbcType=BIGINT},
            </if>
            <if test="nodeContent != null">
            <if test="nodeContent != null and nodeContent !=''">
                node_content = #{nodeContent,jdbcType=VARCHAR},
            </if>
            <if test="deviceCycleContent != null">
            <if test="deviceCycleContent != null and deviceCycleContent !=''">
                device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
            </if>
            <if test="status != null">
            <if test="status != null and status !=''">
                status = #{status,jdbcType=TINYINT},
            </if>
            <if test="result != null">
            <if test="result != null and result !=''">
                result = #{result,jdbcType=TINYINT},
            </if>
            <if test="errorMsg != null">
            <if test="errorMsg != null and errorMsg !=''">
                error_msg = #{errorMsg,jdbcType=VARCHAR},
            </if>
            <if test="assistants != null">
            <if test="assistants != null and assistants !=''">
                assistants = #{assistants,jdbcType=VARCHAR},
            </if>
            <if test="updatedBy != null">
            <if test="updatedBy != null and updatedBy !=''">
                updated_by = #{updatedBy,jdbcType=BIGINT},
            </if>
            <if test="inTime != null">
            <if test="inTime != null and inTime !=''">
                in_time = #{inTime,jdbcType=TIMESTAMP},
            </if>
            <if test="outTime != null">
            <if test="outTime != null and outTime !=''">
                out_time = #{outTime,jdbcType=TIMESTAMP},
            </if>
            <if test="inLineTime != null">
            <if test="inLineTime != null and inLineTime !=''">
                in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
            </if>
            <if test="outLineTime != null">
            <if test="outLineTime != null and outLineTime !=''">
                out_line_time = #{outLineTime,jdbcType=TIMESTAMP},
            </if>
            <if test="memo != null">
            <if test="memo != null and memo !=''">
                memo = #{memo,jdbcType=VARCHAR},
            </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeLastMapper.xml
@@ -81,88 +81,88 @@
    <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">id,</if>
                <if test="deviceNo != null">device_no,</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">node_content,</if>
                <if test="deviceCycleContent != null">device_cycle_content,</if>
                <if test="status != null">status,</if>
                <if test="errorMsg != null">error_msg,</if>
                <if test="assistants != null">assistants,</if>
                <if test="inTime != null">in_time,</if>
                <if test="outTime != null">out_time,</if>
                <if test="updatedBy != null">updated_by,</if>
                <if test="memo != null">memo,</if>
                <if test="id != null and id !=''">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="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="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="memo != null and memo !=''">memo,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</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">#{nodeContent,jdbcType=VARCHAR},</if>
                <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
                <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
                <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
                <if test="id != null and id !=''">#{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="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="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="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLifeLast">
        update sta_device_life_last
        <set>
                <if test="deviceNo != null">
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="workId != null">
                <if test="workId != null and workId !=''">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="repairId != null">
                <if test="repairId != null and repairId !=''">
                    repair_id = #{repairId,jdbcType=BIGINT},
                </if>
                <if test="planId != null">
                <if test="planId != null and planId !=''">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                <if test="stationId != null and stationId !=''">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null">
                <if test="currNode != null and currNode !=''">
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nodeContent != null">
                <if test="nodeContent != null and nodeContent !=''">
                    node_content = #{nodeContent,jdbcType=VARCHAR},
                </if>
                <if test="deviceCycleContent != null">
                <if test="deviceCycleContent != null and deviceCycleContent !=''">
                    device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="errorMsg != null">
                <if test="errorMsg != null and errorMsg !=''">
                    error_msg = #{errorMsg,jdbcType=VARCHAR},
                </if>
                <if test="assistants != null">
                <if test="assistants != null and assistants !=''">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
                <if test="inTime != null">
                <if test="inTime != null and inTime !=''">
                    in_time = #{inTime,jdbcType=TIMESTAMP},
                </if>
                <if test="outTime != null">
                <if test="outTime != null and outTime !=''">
                    out_time = #{outTime,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null">
                <if test="updatedBy != null and updatedBy !=''">
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="memo != null">
                <if test="memo != null and memo !=''">
                    memo = #{memo,jdbcType=VARCHAR},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
@@ -84,93 +84,93 @@
    <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">id,</if>
                <if test="deviceNo != null">device_no,</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">node_content,</if>
                <if test="deviceCycleContent != null">device_cycle_content,</if>
                <if test="status != null">status,</if>
                <if test="result != null">result,</if>
                <if test="errorMsg != null">error_msg,</if>
                <if test="assistants != null">assistants,</if>
                <if test="inTime != null">in_time,</if>
                <if test="outTime != null">out_time,</if>
                <if test="updatedBy != null">updated_by,</if>
                <if test="memo != null">memo,</if>
                <if test="id != null and id !=''">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="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="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="memo != null and memo !=''">memo,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</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">#{nodeContent,jdbcType=VARCHAR},</if>
                <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="result != null">#{result,jdbcType=TINYINT},</if>
                <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
                <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
                <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
                <if test="id != null and id !=''">#{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="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="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="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
        update sta_device_life
        <set>
                <if test="deviceNo != null">
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="workId != null">
                <if test="workId != null and workId !=''">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="repairId != null">
                <if test="repairId != null and repairId !=''">
                    repair_id = #{repairId,jdbcType=BIGINT},
                </if>
                <if test="planId != null">
                <if test="planId != null and planId !=''">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                <if test="stationId != null and stationId !=''">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null">
                <if test="currNode != null and currNode !=''">
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nodeContent != null">
                <if test="nodeContent != null and nodeContent !=''">
                    node_content = #{nodeContent,jdbcType=VARCHAR},
                </if>
                <if test="deviceCycleContent != null">
                <if test="deviceCycleContent != null and deviceCycleContent !=''">
                    device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="result != null">
                <if test="result != null and result !=''">
                    result = #{result,jdbcType=TINYINT},
                </if>
                <if test="errorMsg != null">
                <if test="errorMsg != null and errorMsg !=''">
                    error_msg = #{errorMsg,jdbcType=VARCHAR},
                </if>
                <if test="assistants != null">
                <if test="assistants != null and assistants !=''">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
                <if test="inTime != null">
                <if test="inTime != null and inTime !=''">
                    in_time = #{inTime,jdbcType=TIMESTAMP},
                </if>
                <if test="outTime != null">
                <if test="outTime != null and outTime !=''">
                    out_time = #{outTime,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null">
                <if test="updatedBy != null and updatedBy !=''">
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="memo != null">
                <if test="memo != null and memo !=''">
                    memo = #{memo,jdbcType=VARCHAR},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -72,10 +72,10 @@
            <if test="deviceNo != null and deviceNo !=''">
                and device_no = #{deviceNo,jdbcType=VARCHAR}
            </if>
            <if test="startTime != null">
            <if test="startTime != null and startTime !=''">
                and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
            </if>
            <if test="endTime != null">
            <if test="endTime != null and endTime !=''">
                and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
            </if>
        </where>
@@ -85,10 +85,10 @@
            <if test="deviceNo != null and deviceNo !=''">
                and device_no = #{deviceNo,jdbcType=VARCHAR}
            </if>
            <if test="startTime != null">
            <if test="startTime != null and startTime !=''">
                and out_time <![CDATA[ > ]]> #{startTime,jdbcType=TIMESTAMP}
            </if>
            <if test="endTime != null">
            <if test="endTime != null and endTime !=''">
                and out_time <![CDATA[ < ]]> #{endTime,jdbcType=TIMESTAMP}
            </if>
        </where>
@@ -123,98 +123,98 @@
    <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">id,</if>
                <if test="deviceNo != null">device_no,</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">node_content,</if>
                <if test="deviceCycleContent != null">device_cycle_content,</if>
                <if test="status != null">status,</if>
                <if test="result != null">result,</if>
                <if test="errorMsg != null">error_msg,</if>
                <if test="assistants != null">assistants,</if>
                <if test="inTime != null">in_time,</if>
                <if test="outTime != null">out_time,</if>
                <if test="updatedBy != null">updated_by,</if>
                <if test="memo != null">memo,</if>
                <if test="number != null">number,</if>
                <if test="id != null and id !=''">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="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="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="memo != null and memo !=''">memo,</if>
                <if test="number != null and number !=''">number,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</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">#{nodeContent,jdbcType=VARCHAR},</if>
                <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
                <if test="status != null">#{status,jdbcType=TINYINT},</if>
                <if test="result != null">#{result,jdbcType=TINYINT},</if>
                <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
                <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
                <if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
                <if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
                <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
                <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
                <if test="number != null">#{number,jdbcType=INTEGER},</if>
                <if test="id != null and id !=''">#{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="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="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="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
                <if test="number != null and number !=''">#{number,jdbcType=INTEGER},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
        update sta_device_production_log
        <set>
                <if test="deviceNo != null">
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="workId != null">
                <if test="workId != null and workId !=''">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="repairId != null">
                <if test="repairId != null and repairId !=''">
                    repair_id = #{repairId,jdbcType=BIGINT},
                </if>
                <if test="planId != null">
                <if test="planId != null and planId !=''">
                    plan_id = #{planId,jdbcType=BIGINT},
                </if>
                <if test="stationId != null">
                <if test="stationId != null and stationId !=''">
                    station_id = #{stationId,jdbcType=BIGINT},
                </if>
                <if test="currNode != null">
                <if test="currNode != null and currNode !=''">
                    curr_node = #{currNode,jdbcType=BIGINT},
                </if>
                <if test="nodeContent != null">
                <if test="nodeContent != null and nodeContent !=''">
                    node_content = #{nodeContent,jdbcType=VARCHAR},
                </if>
                <if test="deviceCycleContent != null">
                <if test="deviceCycleContent != null and deviceCycleContent !=''">
                    device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
                </if>
                <if test="status != null">
                <if test="status != null and status !=''">
                    status = #{status,jdbcType=TINYINT},
                </if>
                <if test="result != null">
                <if test="result != null and result !=''">
                    result = #{result,jdbcType=TINYINT},
                </if>
                <if test="errorMsg != null">
                <if test="errorMsg != null and errorMsg !=''">
                    error_msg = #{errorMsg,jdbcType=VARCHAR},
                </if>
                <if test="assistants != null">
                <if test="assistants != null and assistants !=''">
                    assistants = #{assistants,jdbcType=VARCHAR},
                </if>
                <if test="inTime != null">
                <if test="inTime != null and inTime !=''">
                    in_time = #{inTime,jdbcType=TIMESTAMP},
                </if>
                <if test="outTime != null">
                <if test="outTime != null and outTime !=''">
                    out_time = #{outTime,jdbcType=TIMESTAMP},
                </if>
                <if test="updatedBy != null">
                <if test="updatedBy != null and updatedBy !=''">
                    updated_by = #{updatedBy,jdbcType=BIGINT},
                </if>
                <if test="memo != null">
                <if test="memo != null and memo !=''">
                    memo = #{memo,jdbcType=VARCHAR},
                </if>
                <if test="number != null">
                <if test="number != null and number !=''">
                    number = #{number,jdbcType=INTEGER},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
@@ -48,43 +48,43 @@
    <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">id,</if>
                <if test="deviceNo != null">device_no,</if>
                <if test="workId != null">work_id,</if>
                <if test="fromNode != null">from_node,</if>
                <if test="repairReason != null">repair_reason,</if>
                <if test="repairBy != null">repair_by,</if>
                <if test="repairTime != null">repair_time,</if>
                <if test="id != null and id !=''">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="repairReason != null and repairReason !=''">repair_reason,</if>
                <if test="repairBy != null and repairBy !=''">repair_by,</if>
                <if test="repairTime != null and repairTime !=''">repair_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
                <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
                <if test="fromNode != null">#{fromNode,jdbcType=BIGINT},</if>
                <if test="repairReason != null">#{repairReason,jdbcType=VARCHAR},</if>
                <if test="repairBy != null">#{repairBy,jdbcType=BIGINT},</if>
                <if test="repairTime != null">#{repairTime,jdbcType=TIMESTAMP},</if>
                <if test="id != null and id !=''">#{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="repairReason != null and repairReason !=''">#{repairReason,jdbcType=VARCHAR},</if>
                <if test="repairBy != null and repairBy !=''">#{repairBy,jdbcType=BIGINT},</if>
                <if test="repairTime != null and repairTime !=''">#{repairTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
        update sta_repair_info
        <set>
                <if test="deviceNo != null">
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="workId != null">
                <if test="workId != null and workId !=''">
                    work_id = #{workId,jdbcType=BIGINT},
                </if>
                <if test="fromNode != null">
                <if test="fromNode != null and fromNode !=''">
                    from_node = #{fromNode,jdbcType=BIGINT},
                </if>
                <if test="repairReason != null">
                <if test="repairReason != null and repairReason !=''">
                    repair_reason = #{repairReason,jdbcType=VARCHAR},
                </if>
                <if test="repairBy != null">
                <if test="repairBy != null and repairBy !=''">
                    repair_by = #{repairBy,jdbcType=BIGINT},
                </if>
                <if test="repairTime != null">
                <if test="repairTime != null and repairTime !=''">
                    repair_time = #{repairTime,jdbcType=TIMESTAMP},
                </if>
        </set>
pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
@@ -49,43 +49,43 @@
    <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">id,</if>
                <if test="deviceNo != null">device_no,</if>
                <if test="productId != null">product_id,</if>
                <if test="productName != null">product_name,</if>
                <if test="productNo != null">product_no,</if>
                <if test="createTime != null">create_time,</if>
                <if test="createBy != null">create_by,</if>
                <if test="id != null and id !=''">id,</if>
                <if test="deviceNo != null and deviceNo !=''">device_no,</if>
                <if test="productId != null and productId !=''">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>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                <if test="id != null">#{id,jdbcType=BIGINT},</if>
                <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
                <if test="productId != null">#{productId,jdbcType=BIGINT},</if>
                <if test="productName != null">#{productName,jdbcType=VARCHAR},</if>
                <if test="productNo != null">#{productNo,jdbcType=VARCHAR},</if>
                <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
                <if test="createBy != null">#{createBy,jdbcType=BIGINT},</if>
                <if test="id != null and id !=''">#{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="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>
        </trim>
    </insert>
    <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
        update sta_wip_sn_ex
        <set>
                <if test="deviceNo != null">
                <if test="deviceNo != null and deviceNo !=''">
                    device_no = #{deviceNo,jdbcType=VARCHAR},
                </if>
                <if test="productId != null">
                <if test="productId != null and productId !=''">
                    product_id = #{productId,jdbcType=BIGINT},
                </if>
                <if test="productName != null">
                <if test="productName != null and productName !=''">
                    product_name = #{productName,jdbcType=VARCHAR},
                </if>
                <if test="productNo != null">
                <if test="productNo!= null and productNo !=''">
                    product_no = #{productNo,jdbcType=VARCHAR},
                </if>
                <if test="createTime != null">
                <if test="createTime != null and createTime !=''">
                    create_time = #{createTime,jdbcType=TIMESTAMP},
                </if>
                <if test="createBy != null">
                <if test="createBy != null and createBy !=''">
                    create_by = #{createBy,jdbcType=BIGINT},
                </if>
        </set>