接口优化

base/nckd-base-common/src/main/java/nckd/base/common/utils/TripSyncBillUtils.java

@@ -95,9 +95,9 @@ public class TripSyncBillUtils {
             //城市分类名称
             dHotelTravelStandards.put("cityClassifyName", tripAreaName);
             //淡季差标金额
-            dHotelTravelStandards.put("lowSeasonPrice", ObjectUtils.isEmpty(standardAmount) ? BigDecimal.ZERO : standardAmount);
+            dHotelTravelStandards.put("lowSeasonPrice", ObjectUtils.isEmpty(standardAmount) ? BigDecimal.ZERO : standardAmount.setScale(2));
             //旺季差标金额
-            dHotelTravelStandards.put("busySeasonPrice", ObjectUtils.isEmpty(highSeasonStandardAmount) ? BigDecimal.ZERO : highSeasonStandardAmount);
+            dHotelTravelStandards.put("busySeasonPrice", ObjectUtils.isEmpty(highSeasonStandardAmount) ? BigDecimal.ZERO : highSeasonStandardAmount.setScale(2));
             //旺季月份 多个月份逗号隔开（例：1,2,3,4,5,6,7,8）
             dHotelTravelStandards.put("busySeasonMonths", processMonthRanges(dateEntry));
 

nckd-fi/src/main/java/nckd/fi/er/common/utils/TripReqBillUtils.java

@@ -118,6 +118,10 @@ public class TripReqBillUtils {
     private static List<String> validateTripReqBillModel(TripReqBillModel model, String prefix) {
         List<String> errorMessages = new ArrayList<>();
 
+        // 校验基本必填字段
+        if (ObjectUtils.isEmpty(model.getBillNo())) {
+            errorMessages.add(prefix + "的单据编号不能为空");
+        }
         // 校验基本必填字段
         if (ObjectUtils.isEmpty(model.getApplier())) {
             errorMessages.add(prefix + "的申请人不能为空");

nckd-fi/src/main/java/nckd/fi/er/webapi/cutomer/TripReqBillWebApiPlugin.java

@@ -163,8 +163,9 @@ public class TripReqBillWebApiPlugin {
             DynamicObject tripReqBill = BusinessDataServiceHelper.newDynamicObject(TripReqBillConstant.FORMBILLID);
 
             //单据编号
-            CodeRuleInfo codeRule = CodeRuleServiceHelper.getCodeRule(tripReqBill.getDataEntityType().getName(), tripReqBill, null);
-            tripReqBill.set(TripReqBillConstant.BILLNO, CodeRuleServiceHelper.getNumber(codeRule, tripReqBill));
+//            CodeRuleInfo codeRule = CodeRuleServiceHelper.getCodeRule(tripReqBill.getDataEntityType().getName(), tripReqBill, null);
+//            tripReqBill.set(TripReqBillConstant.BILLNO, CodeRuleServiceHelper.getNumber(codeRule, tripReqBill));
+            tripReqBill.set(TripReqBillConstant.BILLNO, tripReqBillModel.getBillNo());
 
             //单据状态
             tripReqBill.set(TripReqBillConstant.BILLSTATUS, BillStatusEnum.SAVE.getValue());

nckd-fi/src/main/java/nckd/fi/er/webapi/model/TripEntryModel.java

@@ -7,7 +7,7 @@ import nckd.base.common.model.BaseModel;
 import java.math.BigDecimal;
 
 /**
- * @description：出差申请.行程信息
+ * @description：出差申请.行程信息 增加字段请在接口里增加必填校验
  * @author： dingsixi
  * @create： 2025/12/11 15:40
  */

nckd-fi/src/main/java/nckd/fi/er/webapi/model/TripReqBillModel.java

@@ -7,12 +7,15 @@ import nckd.base.common.model.BaseModel;
 import java.util.List;
 
 /**
- * @description：出差申请
+ * @description：出差申请  增加字段请在接口里增加必填校验
  * @author： dingsixi
  * @create： 2025/12/11 14:53
  */
 @ApiModel
 public class TripReqBillModel extends BaseModel {
+
+    @ApiParam(value = "单据编号",required = true)
+    private String billNo;
     @ApiParam(value = "申请人",required = true)
     private String applier;
 
@@ -40,6 +43,14 @@ public class TripReqBillModel extends BaseModel {
     @ApiParam(value = "行程信息",required = true)
     private List<TripEntryModel> tripEntryModelList;
 
+    public String getBillNo() {
+        return billNo;
+    }
+
+    public void setBillNo(String billNo) {
+        this.billNo = billNo;
+    }
+
     public String getApplierPosition() {
         return applierPosition;
     }