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

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMrpBaseServiceImpl.java

@@ -318,11 +318,13 @@ public class BusMrpBaseServiceImpl extends ServiceImpl<BusMrpBaseMapper, BusMrpB
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         }
         map.put("remainingQuantity",quantity.subtract(reduce));
-        map.put("specification",busBillofquantities.getSpecification());
         map.put("suppliespriceId",limitListId);
+        if (busBillofquantities != null) {
+            map.put("specification",busBillofquantities.getSpecification());
             map.put("unit",busBillofquantities.getUnit());
             map.put("remark",busBillofquantities.getRemark());
             map.put("name",busBillofquantities.getName());
+        }
         return map;
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdJsqdTz.java

@@ -1,12 +1,16 @@
 package org.dromara.xzd.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.math.BigDecimal;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 决算清单(调整)对象 xzd_jsqd_tz
@@ -133,6 +137,23 @@ public class XzdJsqdTz extends BaseEntity {
      */
     private String tzhwbs;
 
+    /**
+     * 质保期
+     */
+    private int zbq;
+
+    /**
+     * 归还期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ghq;
+
+    /**
+     * 归还比例
+     */
+    private BigDecimal ghbl;
+
     /**
      * 备注
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java

@@ -185,7 +185,7 @@ public class XzdProject extends BaseEntity {
     /**
      * 计划总投资
      */
-    private Long plannedTotalInvestment;
+    private BigDecimal plannedTotalInvestment;
 
     /**
      * 政府备案项目名称

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdJsqdTzBo.java

@@ -1,12 +1,15 @@
 package org.dromara.xzd.domain.bo;
 
-import org.dromara.xzd.domain.XzdJsqdTz;
+import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.xzd.domain.XzdJsqdTz;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 决算清单(调整)业务对象 xzd_jsqd_tz
@@ -134,6 +137,23 @@ public class XzdJsqdTzBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 质保期
+     */
+    private int zbq;
+
+    /**
+     * 归还期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ghq;
+
+    /**
+     * 归还比例
+     */
+    private BigDecimal ghbl;
+
     /**
      * 数据来源
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java

@@ -201,7 +201,7 @@ public class XzdProjectBo extends BaseEntity {
     /**
      * 计划总投资
      */
-    private Long plannedTotalInvestment;
+    private BigDecimal plannedTotalInvestment;
 
     /**
      * 政府备案项目名称

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractAccountVo.java

@@ -133,6 +133,7 @@ public class XzdContractAccountVo implements Serializable {
      * 甲方单位(客户)
      */
     @ExcelProperty(value = "甲方单位(客户)")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "firstPartyId")
     private String firstParty;
 
     /**
@@ -144,6 +145,7 @@ public class XzdContractAccountVo implements Serializable {
      * 乙方单位(供应商)
      */
     @ExcelProperty(value = "乙方单位(供应商)")
+    @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME,mapper = "secondPartyId")
     private String secondParty;
 
     /**

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdJsqdTzVo.java

@@ -1,14 +1,17 @@
 package org.dromara.xzd.domain.vo;
 
-import java.math.BigDecimal;
-import org.dromara.xzd.domain.XzdJsqdTz;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.xzd.domain.XzdJsqdTz;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 
 /**
@@ -157,6 +160,23 @@ public class XzdJsqdTzVo implements Serializable {
     @ExcelProperty(value = "调整后wbs")
     private String tzhwbs;
 
+    /**
+     * 质保期
+     */
+    private int zbq;
+
+    /**
+     * 归还期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date ghq;
+
+    /**
+     * 归还比例
+     */
+    private BigDecimal ghbl;
+
     /**
      * 备注
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java

@@ -251,7 +251,7 @@ public class XzdProjectVo implements Serializable {
      * 计划总投资
      */
     @ExcelProperty(value = "计划总投资")
-    private Long plannedTotalInvestment;
+    private BigDecimal plannedTotalInvestment;
 
     /**
      * 政府备案项目名称