Merge remote-tracking branch 'origin/master'

刘小明

2024-08-13 9bfdf1ff20086c04bbe6576706bfee95c9d7fea0

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

@@ -10,12 +10,14 @@
    <result column="new_name" property="newName" />
    <result column="hash" property="hash" />
    <result column="file_path" property="filePath" />
    <result column="download_path" property="downloadPath" />
    <result column="dt" property="dt" />
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, org_name, ext_name, new_name, hash, file_path, download_path, dt
    id, org_name, ext_name, new_name, hash, file_path, dt
  </sql>
  <sql id="Join_Column_List">
    ${alias}.id, ${alias}.org_name, ${alias}.ext_name, ${alias}.new_name, ${alias}.hash, ${alias}.file_path, ${alias}.dt
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
    <!--@mbg.generated-->
@@ -31,9 +33,9 @@
  </delete>
  <insert id="insert" parameterType="com.dy.pmsGlobal.pojoOth.OthFile">
    <!--@mbg.generated-->
    insert into oth_file (id, org_name, ext_name, new_name, hash, file_path, download_path, 
    insert into oth_file (id, org_name, ext_name, new_name, hash, file_path,
      dt)
    values (#{id}, #{orgName}, #{extName}, #{newName}, #{hash}, #{filePath}, #{downloadPath}, 
    values (#{id}, #{orgName}, #{extName}, #{newName}, #{hash}, #{filePath},
      #{dt})
  </insert>
  <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoOth.OthFile">
@@ -58,9 +60,6 @@
      <if test="filePath != null">
        file_path,
      </if>
      <if test="downloadPath != null">
        download_path,
      </if>
      <if test="dt != null">
        dt,
      </if>
@@ -83,9 +82,6 @@
      </if>
      <if test="filePath != null">
        #{filePath},
      </if>
      <if test="downloadPath != null">
        #{downloadPath},
      </if>
      <if test="dt != null">
        #{dt},
@@ -111,9 +107,6 @@
      <if test="filePath != null">
        file_path = #{filePath},
      </if>
      <if test="downloadPath != null">
        download_path = #{downloadPath},
      </if>
      <if test="dt != null">
        dt = #{dt},
      </if>
@@ -128,8 +121,17 @@
      new_name = #{newName},
      hash = #{hash},
      file_path = #{filePath},
      download_path = #{downloadPath},
      dt = #{dt}
    where id = #{id}
  </update>

  <select id="selectByProId" resultMap="BaseResultMap">
    select
    <include refid="Join_Column_List">
        <property name="alias" value="f"/>
    </include>
    from oth_file f
    inner join plt_product_file pf on f.id = pf.file_id
    where pf.pro_id = #{proId}
  </select>
</mapper>