1.安装告知、使用登记、改造变更登记增加，压力管道详情页面增加设备种类、设备类别、设备品种后端修改

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/JgChangeRegistrationReformServiceImpl.java

@@ -865,6 +865,25 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         });
     }
 
+    /**
+     * 历史数据填充设备种类、设备类别、设备品种
+     * @param detail  返回json
+     * @param jgChangeRegistrationReform  当前单据
+     */
+    private void fillingEquCategoryNameForHisData(Map<String, Object> detail, JgChangeRegistrationReform jgChangeRegistrationReform) {
+        if(!org.springframework.util.StringUtils.isEmpty(jgChangeRegistrationReform.getProjectContraptionId())){
+            LambdaQueryWrapper<IdxBizJgProjectContraption> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(BaseEntity::getSequenceNbr, jgChangeRegistrationReform.getProjectContraptionId());
+            queryWrapper.select(IdxBizJgProjectContraption::getEquListName,IdxBizJgProjectContraption::getEquCategoryName,IdxBizJgProjectContraption::getEquDefineName,BaseEntity::getSequenceNbr);
+            IdxBizJgProjectContraption projectContraption = jgProjectContraptionService.getBaseMapper().selectOne(queryWrapper);
+            if(projectContraption != null){
+                detail.put("equListName", projectContraption.getEquListName());
+                detail.put("equCategoryName", projectContraption.getEquCategoryName());
+                detail.put("equDefineName", projectContraption.getEquDefineName());
+            }
+        }
+    }
+
     @Override
     public Map<String, Object> getDetail(String currentDocumentId, String equipId) {
         JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectById(currentDocumentId);
@@ -891,6 +910,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
         detail.remove("submit");
         detail.remove("instanceId");
+        this.fillingEquCategoryNameForHisData(detail, jgChangeRegistrationReform);
         return detail;
     }