Merge remote-tracking branch 'origin/develop_dl' into develop_dl_bugfix

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/WlSpareEquipment.java

@@ -137,5 +137,7 @@ public class WlSpareEquipment extends BaseEntity implements Serializable {
 
     @TableField(exist = false)
     private String code; // 装备定义code筛选字段
+    @TableField(exist = false)
+    private String stockNumString;
 }
 

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/WlSpareEquipmentExportVo.java

@@ -24,7 +24,7 @@ public class WlSpareEquipmentExportVo {
 
     @Excel(name = "数量")
     @ExcelProperty(value = "数量", index = 3)
-    private Float stockNum; // 库存数量
+    private String stockNumString; // 库存数量
 
     @Excel(name = "计量单位")
     @ExcelProperty(value = "计量单位", index = 4)

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

@@ -212,6 +212,7 @@ public class WlSpareEquipmentServiceImpl extends ServiceImpl<WlSpareEquipmentMap
 
             WlSpareEquipment wlSpareEquipment = new WlSpareEquipment();
             BeanUtils.copyProperties(item, wlSpareEquipment);
+            wlSpareEquipment.setStockNum(Float.valueOf(item.getStockNumString()));
             if (ObjectUtils.isNotEmpty(equipment)) {
                 wlSpareEquipment.setEquipModelId(equipment.getId());
                 wlSpareEquipment.setEquipModelName(equipment.getName());

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

@@ -59,7 +59,8 @@
 
 <select id="exportList" resultType="com.yeejoin.equipmanage.common.entity.WlSpareEquipment">
     SELECT
-    *
+    *,
+    stock_num as stockNumString
     FROM wl_spare_equipment
     <where>
         is_delete = 0