1.设置Jackson时区

2.修复生成机器设备融资项目报告不填写产品号生成时报错
3.机器设备融资报告金额设置显示千分位

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

@@ -5,4 +5,6 @@ spring:
     name: productivity-platform
   freemarker:
     checkTemplateLocation:  false
+  jackson:
+    time-zone: GMT+8
 

domain/src/main/java/com/dayou/bo/EqptReportFillBO.java

@@ -29,6 +29,16 @@ public class EqptReportFillBO {
     private BigDecimal bookNetValue;
 
     /**
+     * 账面原值(千分位格式)
+     */
+    private String bookOriginalValueStr;
+
+    /**
+     * 账面净值(千分位格式)
+     */
+    private String bookNetValueStr;
+
+    /**
      * 评估原值
      */
     private BigDecimal evaluateOriginalValue;
@@ -38,6 +48,17 @@ public class EqptReportFillBO {
      */
     private BigDecimal evaluateNetValue;
 
+
+    /**
+     * 评估原值(千分位格式)
+     */
+    private String evaluateOriginalValueStr;
+
+    /**
+     * 评估净值(千分位格式)
+     */
+    private String evaluateNetValueStr;
+
     /**
      * 增值率
      */

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

@@ -2,6 +2,7 @@ package com.dayou.entity;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dayou.common.BaseEntity;
 
@@ -37,66 +38,77 @@ public class AssetsCalculateEqptData extends BaseEntity implements Serializable
      * 序号
      */
     @ExcelProperty("序号")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer sortId;
 
     /**
      * 设备名称
      */
     @ExcelProperty("设备名称")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String equipmentName;
 
     /**
      * 生产厂家
      */
     @ExcelProperty("生产厂家")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String manufacturer;
 
     /**
      * 型号规格
      */
     @ExcelProperty("型号规格")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String model;
 
     /**
      * 购买日期
      */
     @ExcelProperty("购买日期")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private LocalDate purchaseDate;
 
     /**
      * 启用日期
      */
     @ExcelProperty("启用日期")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private LocalDate activationDate;
 
     /**
      * 存放地点
      */
     @ExcelProperty("存放地点")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String storageLocation;
 
     /**
      * 数量
      */
     @ExcelProperty("数量")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String quantity;
 
     /**
      * 计量单位
      */
     @ExcelProperty("计量单位")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String unitOfMeasurement;
 
     /**
      * 账面原值
      */
     @ExcelProperty("账面原值")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Float bookOriginalValue;
 
     /**
      * 账面净值
      */
     @ExcelProperty("账面净值")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Float bookNetValue;
 
 
@@ -128,24 +140,28 @@ public class AssetsCalculateEqptData extends BaseEntity implements Serializable
      * 备注
      */
     @ExcelProperty("备注")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String remark;
 
     /**
      * 经济使用年数
      */
     @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer economicServiceLife;
 
     /**
      * 直接观察成新率
      */
     @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal directObservationDepreciationRate;
 
     /**
      * 设备类型
      */
     @ExcelProperty("设备类型")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String equipmentType;
 
     /**
@@ -158,41 +174,49 @@ public class AssetsCalculateEqptData extends BaseEntity implements Serializable
      * 询价依据
      */
     @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String inquiryBasis;
 
     /**
      * 询价地点
      */
     @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String inquiryLocation;
 
     /**
-     * 单价
+     * 询价单价（元）
      */
     @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal price;
 
     /**
      * 运杂费率
      */
     @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal freightAndMiscellaneousFeeRate;
 
     /**
      * 基础费率
      */
     @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal baseRate;
 
     /**
      * 安装费率
      */
     @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal installationRate;
 
     /**
      * 使用情况
      */
+    @ExcelIgnore
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String usageSituation;
 
     /**

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

@@ -43,6 +43,7 @@ public class AssetsProjectServiceImpl extends ServiceImpl<AssetsProjectMapper, A
     @Override
     public Page<AssetsProjectVO> getAssetsProject(Page page, AssetsProjectQueryDTO dto) {
         dto.setCreateUserId(StpUtil.getLoginIdAsLong());
+        Page<AssetsProjectVO> assetsProjectVO = assetsProjectMapper.getAssetsProject(page, dto);
         return assetsProjectMapper.getAssetsProject(page, dto);
     }
 

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

@@ -33,6 +33,7 @@ import java.io.*;
 import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.text.DecimalFormat;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -156,6 +157,12 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
         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);
         }
+        // 将账面、评估的原值、净值处理成千分位格式
+        DecimalFormat decimalFormat = new DecimalFormat("#,##0.##");
+        eqptReportFillBO.setBookOriginalValueStr(decimalFormat.format(eqptReportFillBO.getBookOriginalValue()));
+        eqptReportFillBO.setBookNetValueStr(decimalFormat.format(eqptReportFillBO.getBookNetValue()));
+        eqptReportFillBO.setEvaluateOriginalValueStr(decimalFormat.format(eqptReportFillBO.getEvaluateOriginalValue()));
+        eqptReportFillBO.setEvaluateNetValueStr(decimalFormat.format(eqptReportFillBO.getEvaluateNetValue()));
         // 设置其他的信息
         eqptReportFillBO.setEqptReportBaseInfo(objectMapper.readValue(getReportBaseInfo(reportId), EqptReportBaseInfoDTO.class));
         // 设置委托人和产权持有人的名字
@@ -356,7 +363,7 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
                 .setDocUrl(mainPath)
                 .setCreateUserId(StpUtil.getLoginIdAsLong())
                 .setBusinessCate(assetsReportVO.getProjectTypeName())
-                .setDocNo(eqptReportFillBO.getProductionNo())
+                .setDocNo(ObjectUtil.isNotNull(eqptReportFillBO.getProductionNo()) ? eqptReportFillBO.getProductionNo() : "")
                 .setBusinessSubId(reportId);
         return documentProductionService.saveDocumentProduction(documentProduction);
     }