1.优化机器设备生成

biz-base/src/main/resources/application-prod.yaml

@@ -68,9 +68,9 @@ file-net:
   # 基础配置
   base-dir: /opt/dfs/productivity-platform/
   max-file-size: 102400
-  domain: http://doc.scdayou.com/dfs
+  domain: http://doc.scdayou.com/dfs/productivity-platform
   # 图片
-  image: images/
+  image: /images/
   # 资产业务配置
   asset-template-report-path: assets/templates/report/
   asset-template-calculate-path: assets/templates/calculate/

dao/src/main/java/com/dayou/mapper/AssetsReportMapper.java

@@ -61,7 +61,7 @@ public interface AssetsReportMapper extends BaseMapper<AssetsReport> {
      * @param reportId 报告id
      * @return EqptReportFillBO
      */
-    EqptReportFillBO geteqptReportFillBO(@Param("reportId") Long reportId);
+    EqptReportFillBO getEqptReportFillBO(@Param("reportId") Long reportId);
 
     /**
      * 获取新增DocumentProduction所需的报告信息

dao/src/main/resources/mapper/AssetsReportMapper.xml

@@ -80,7 +80,7 @@
     </select>
 
     <!--根据报告id获取生成机器设备报告word文档所需信息-->
-    <select id="geteqptReportFillBO" resultType="com.dayou.bo.EqptReportFillBO">
+    <select id="getEqptReportFillBO" resultType="com.dayou.bo.EqptReportFillBO">
         SELECT production_no AS productionNo,
                SUM(eqptData.book_original_value) AS bookOriginalValue,
                SUM(eqptData.book_net_value) AS bookNetValue,

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

@@ -38,7 +38,6 @@ import java.util.stream.Collectors;
 
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.dayou.enums.DocumentType.EQPT_CALCULATE;
 import static com.dayou.enums.DocumentType.EQPT_REPORT;
 import static com.dayou.enums.EqptReportTmplCode.*;
 
@@ -152,9 +151,11 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
 
         // 获取与设置基础报告信息
         ObjectMapper objectMapper = new ObjectMapper();
-        EqptReportFillBO eqptReportFillBO = assetsReportMapper.geteqptReportFillBO(reportId);
+        EqptReportFillBO eqptReportFillBO = assetsReportMapper.getEqptReportFillBO(reportId);
         // 设置增值率(评估净值 - 账面净值) / 账面净值,保留两位小数
-        eqptReportFillBO.setValueAddedRate(((eqptReportFillBO.getEvaluateNetValue().subtract(eqptReportFillBO.getBookNetValue())).divide(eqptReportFillBO.getBookNetValue(), 2, RoundingMode.HALF_UP)).doubleValue() * 100);
+        if (ObjectUtil.isNotNull(eqptReportFillBO.getEvaluateNetValue()) && ObjectUtil.isNotNull(eqptReportFillBO.getBookNetValue())) {
+            eqptReportFillBO.setValueAddedRate(((eqptReportFillBO.getEvaluateNetValue().subtract(eqptReportFillBO.getBookNetValue())).divide(eqptReportFillBO.getBookNetValue(), 2, RoundingMode.HALF_UP)).doubleValue() * 100);
+        }
         // 设置其他的信息
         eqptReportFillBO.setEqptReportBaseInfo(objectMapper.readValue(getReportBaseInfo(reportId), EqptReportBaseInfoDTO.class));
         // 设置委托人和产权持有人的名字