Merge remote-tracking branch 'origin/master'

kongdeqiang

2025-04-02 adf58ddc0337678c2a6770fe8687e54a44998c0d

 platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml

@@ -16,4 +16,43 @@
        <result property="updateTime" column="update_time"/>
        <result property="delFlag" column="del_flag"/>
  </resultMap>
    <select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNoteItemPageVo">
      select
         rni.id,
         rni.num  ,
         rni.device_code,
         rni.device_name ,
         rni.device_models ,
         rni.key_parameter ,
         rni.metering_unit ,
         rni.`output` ,
         rn.release_code
      from
         receiving_note_item rni
      join receiving_note rn on rn.id = rni.note_id
      where
         rni.del_flag = '0'
      <if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
         and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
      </if>
      <if test="queryDTO.noteId != null and queryDTO.noteId !=''">
         and rni.note_id = #{queryDTO.noteId}
      </if>
   </select>
    <select id="selectDeviceNumByContractId" resultType="java.lang.Integer">
      select
         ifnull(sum(rni.num),0)
      from
         receiving_note_item rni
      where
         rni.device_id = #{deviceId}
        and exists (
            select
               *
            from
               receiving_note rn
            where
               rn.contract_id = #{contractId}
              and rn.id = rni.note_id)
   </select>
</mapper>