wms租赁定时任务推送到bms（未完成 定时任务没有当前登录人 需要改造后面方法）

mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billingRules/CostCalculationDTO.java

@@ -1,5 +1,6 @@
 package com.mhd.bms.interfaces.dto.billingRules;
 
+import com.mhd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.validation.annotation.Validated;
@@ -35,6 +36,10 @@ public class CostCalculationDTO{
     @NotBlank(message = "计费参数不能为空")
     private String formJson;
 
+    @ApiModelProperty("一级组织表ID")
+    @Excel(name = "一级组织表ID")
+    private Long topOrganizationId;
+
 
 
 

mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java

@@ -8,6 +8,7 @@ import java.math.BigDecimal;
 import io.swagger.annotations.ApiModelProperty;
 import com.mhd.common.core.web.domain.BaseVOEntity;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -196,4 +197,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{
 
     @ApiModelProperty("重算金额")
     private BigDecimal recalculateCost;
+
+    @ApiModelProperty("结算主体id")
+    private Long settlementEntityId;
 }

mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BusinessDocumentApi.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.mhd.bms.application.server.businessDocument.BusinessDocumentApplicationService;
 import com.mhd.common.core.domain.dto.BusinessDataPushDTO;
+import com.mhd.common.core.utils.IgnoreNullUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,6 +76,26 @@ public class BusinessDocumentApi extends BaseController{
 
     }
 
+
+    /**
+     * 整租推送
+     */
+    @ApiOperation("整租推送")
+    @PostMapping("/wholeRentSynchronization")
+    public AjaxResult wholeRentSynchronization(@RequestBody BusinessDocumentDTO businessDocumentDTO)
+    {
+        try {
+            //转换实体
+            BusinessDocumentDO businessDocumentDO = new BusinessDocumentDO();
+            // 拷贝
+            com.mhd.common.core.utils.bean.BeanUtils.copyProperties(businessDocumentDTO, businessDocumentDO, IgnoreNullUtil.getNullPropertyNames(businessDocumentDTO));
+            return toAjax(businessDocumentApplicationService.wholeRentSynchronization(businessDocumentDO));
+        }catch (Exception e){
+            return AjaxResult.error("保存业务单据失败" +e.getMessage());
+        }
+
+    }
+
     /**
      * 批量删除业务单据
      */