浙江省设备平台右屏接口代码提交

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -411,7 +411,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         }
         // 二维码
         String equipStatus = equipmentSpecific.getEquipStatus();
-        int type = Objects.equals(equipStatus, "0") ? 3 : 1;
+        int type = Objects.equals(equipStatus, "0") ? 3 : Objects.equals(equipStatus, "1") ? 2 : 1;
         String qrCodeImage = QRCodeUtil.genQrCodeBase64PngWithWord(equipmentSpecific.getQrCode(), 200, 200, equipmentSpecific.getQrCode(),200, type);
         equipmentDetail.setQrCodeImage(qrCodeImage);
         // 消防系统

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1965,6 +1965,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                         JSONObject jsonObject = new JSONObject();
                         Map<String, String> map = new HashMap<>();
                         map.put("id", e.get("id").toString());
+                        map.put("code", e.get("code").toString());
                         map.put("bizOrgCode", e.get("bizOrgCode").toString());
                         map.put("bizOrgName", e.get("bizOrgName").toString());
                         jsonObject.put("topic", "equip/scrap/put");

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -480,6 +480,7 @@
                wlsd.status,
                wes.position,
                wes.name,
+               wec.code,
                we.expiry_date as weExpiry,
                wed.area as area,
                wed.production_date as product,
@@ -488,6 +489,7 @@
         from wl_equipment_specific wes
                  left join wl_equipment_detail wed on wes.equipment_detail_id = wed.id
                  left join wl_equipment we on wed.equipment_id = we.id
+                 left join wl_equipment_category wec on wec.id = we.category_id
                  left join wl_warehouse_structure str on str.id = wes.warehouse_structure_id
                  left join wl_stock_detail wlsd on wes.id = wlsd.equipment_specific_id
         where wed.production_date is not null