feat(已纳管设备无证时可编辑)：已纳管设备调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgResumeInfoMapper.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -19,4 +21,5 @@ public interface JgResumeInfoMapper extends BaseMapper<JgResumeInfo> {
 
     Page<JgResumeInfoDto> queryPageListByChangeIds(Page<?> page, @Param("equIds") Set<String> equIds);
 
+    List<JgResumeInfoDto> selectResumeInfoByEquips(@Param("recordOrPIds") List<String> recordOrPIds, @Param("applyNo") String applyNo);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgResumeInfoMapper.xml

@@ -19,4 +19,20 @@
         </foreach>
         order by rec_date desc
     </select>
+    <select id="selectResumeInfoByEquips" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto">
+        SELECT
+            sequence_nbr,
+            business_type,
+            apply_no
+        FROM
+            "tzs_jg_resume_info"
+        WHERE
+            "equ_id" in
+            <foreach collection="recordOrPIds" item="equId" open="(" separator="or" close=")">
+                equ_id  = #{equId}
+            </foreach>
+            and resume_type= '0'
+            and apply_no <![CDATA[<>]]> #{applyNo}
+            ORDER BY "rec_date" DESC
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -130,6 +130,7 @@
              from
                  idx_biz_jg_supervision_info ibjsi where ibjsi.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as orgBranchName
         from
+            
             tzs_jg_use_registration ur
     </sql>
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -294,6 +294,9 @@ public class CommonServiceImpl implements ICommonService {
     @Autowired
     private CbDataDictTypeHandler dataDictTypeHandler;
 
+    @Autowired
+    private JgResumeInfoServiceImpl jgResumeInfoService;
+
     public static final String DATA_QUALITY_SCORE = "DATA_QUALITY_SCORE";
 
     public static byte[] file2byte(File file) {
@@ -3202,4 +3205,13 @@ public class CommonServiceImpl implements ICommonService {
         }
     }
 
+    /**
+     * 查询非指定单据的设备或者装置的履历信息
+     * @param recordOrPIds 设备或者装置id集合
+     * @return 指定单据的设备或者装置的履历信息数组
+     */
+    public List<JgResumeInfoDto> getResumeInfosBatch(List<String> recordOrPIds, String applyNo){
+        return jgResumeInfoService.getBaseMapper().selectResumeInfoByEquips(recordOrPIds, applyNo);
+    }
+
 }
\ No newline at end of file