Merge remote-tracking branch 'origin/master' into dev

domain/src/main/java/com/dayou/entity/AssetsCalculateEqptData.java

@@ -102,14 +102,14 @@ public class AssetsCalculateEqptData extends BaseEntity implements Serializable
      */
     @ExcelProperty("账面原值")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private Float bookOriginalValue;
+    private BigDecimal bookOriginalValue;
 
     /**
      * 账面净值
      */
     @ExcelProperty("账面净值")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private Float bookNetValue;
+    private BigDecimal bookNetValue;
 
 
     /**

service/src/main/java/com/dayou/service/impl/AssetsCalculateServiceImpl.java

@@ -264,7 +264,7 @@ public class AssetsCalculateServiceImpl extends ServiceImpl<AssetsCalculateMappe
 
         // 第五步:设置进口设备的测算表
         List<AssetsCalculateEqptImpDataVO> impEqptData = dataService.getImpDataList(calculateId);
-        if (ObjectUtil.isNotNull(impEqptData)) {
+        if (ObjectUtil.isNotNull(impEqptData) && ObjectUtil.isNotEmpty(impEqptData)) {
             // 获取模板
             TmplAssetCalculateSection imported = calculateSectionMapper.getByTmplCode(IMPORTED.getCode());
             // 生成后文件的位置
@@ -329,7 +329,7 @@ public class AssetsCalculateServiceImpl extends ServiceImpl<AssetsCalculateMappe
 
         // 第六步:设置非标设备的测算表
         List<AssetsCalculateEqptNonsDataVO> nonsEqptData = dataService.getNonSDataList(calculateId);
-        if (ObjectUtil.isNotNull(nonsEqptData)) {
+        if (ObjectUtil.isNotNull(nonsEqptData) && ObjectUtil.isNotEmpty(nonsEqptData)) {
             // 获取模板
             TmplAssetCalculateSection nonstandard = calculateSectionMapper.getByTmplCode(NONSTANDARD.getCode());
             // 生成后文件的位置