修改参数

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/service/impl/BusinessFsOutConfirmServiceImpl.java

@@ -107,17 +107,17 @@ public class BusinessFsOutConfirmServiceImpl extends ServiceImpl<BusinessFsOutCo
                         .eq(BusinessStoreWareDetail::getZid, id)
                         .eq(BusinessStoreWareDetail::getType, "contract"));
 
-        List<BusinessStoreWareDetailVO> storeWareDetailVOList = new ArrayList<>();
+        List<BusinessStoreWareDetailDataVO> storeWareDetailVOList = new ArrayList<>();
 
         if (CollectionUtil.isNotEmpty(storeWareDetailList)) {
             for (BusinessStoreWareDetail businessStoreWareDetail : storeWareDetailList) {
-                BusinessStoreWareDetailVO storeWareDetailVO = new BusinessStoreWareDetailVO();
+                BusinessStoreWareDetailDataVO storeWareDetailVO = new BusinessStoreWareDetailDataVO();
 
                 //获取仓房
                 BasicEnum houseInfo = basicEnumMapper.selectById(businessStoreWareDetail.getHouseId());
                 if (ObjectUtils.isNotEmpty(houseInfo)) {
-                    storeWareDetailVO.setHouseId(businessStoreWareDetail.getHouseId());
-                    storeWareDetailVO.setHouseName(houseInfo.getEnumname());
+                    storeWareDetailVO.setBasicStorehouseId(businessStoreWareDetail.getHouseId());
+                    storeWareDetailVO.setBasicStorehouseName(houseInfo.getEnumname());
                 }
 
                 //获取货位
@@ -130,18 +130,18 @@ public class BusinessFsOutConfirmServiceImpl extends ServiceImpl<BusinessFsOutCo
                 //获取品种
                 BasicEnum grainKind = basicEnumMapper.selectById(businessStoreWareDetail.getGrainKind());
                 if (ObjectUtils.isNotEmpty(grainKind)) {
-                    storeWareDetailVO.setGrainKind(businessStoreWareDetail.getGrainKind());
-                    storeWareDetailVO.setGrainKindName(grainKind.getEnumname());
+                    storeWareDetailVO.setGrainVarietyId(businessStoreWareDetail.getGrainKind());
+                    storeWareDetailVO.setGrainVarietyName(grainKind.getEnumname());
                 }
                 //获取性质
                 BasicEnum grainAttribute = basicEnumMapper.selectById(businessStoreWareDetail.getGrainAttribute());
                 if (ObjectUtils.isNotEmpty(grainAttribute)) {
-                    storeWareDetailVO.setGrainAttribute(businessStoreWareDetail.getGrainAttribute());
-                    storeWareDetailVO.setGrainAttributeName(grainAttribute.getEnumname());
+                    storeWareDetailVO.setGrainNatureId(businessStoreWareDetail.getGrainAttribute());
+                    storeWareDetailVO.setGrainNatureName(grainAttribute.getEnumname());
                 }
 
                 //销售合同使用轮出价格，数量和总价
-                storeWareDetailVO.setInPrice(businessStoreWareDetail.getOutPrice() == null ? "0.0" : businessStoreWareDetail.getOutPrice());
+                storeWareDetailVO.setSettlePrice(businessStoreWareDetail.getOutPrice() == null ? "0.0" : businessStoreWareDetail.getOutPrice());
 
                 //获取保存的确认单数量
                 Double sum = businessFsOutConfirmMapper.selectSum(id, businessStoreWareDetail.getGrainKind(), businessStoreWareDetail.getGrainAttribute());
@@ -155,39 +155,39 @@ public class BusinessFsOutConfirmServiceImpl extends ServiceImpl<BusinessFsOutCo
                 double num = Double.parseDouble(businessStoreWareDetail.getOutCount()) - sum;
 
                 if (num <= 0) {
-                    storeWareDetailVO.setInCount("0.0");
+                    storeWareDetailVO.setSettleQuantity("0.0");
                     storeWareDetailVOList.add(storeWareDetailVO);
                 } else {
-                    storeWareDetailVO.setInCount(Double.toString(num));
+                    storeWareDetailVO.setSettleQuantity(Double.toString(num));
                     storeWareDetailVOList.add(storeWareDetailVO);
                 }
             }
         }
 
 
-        List<BusinessStoreWareDetailVO> list = new ArrayList<>();
+        List<BusinessStoreWareDetailDataVO> list = new ArrayList<>();
 
         //通过仓房，货位，品种，性质进行汇总
-        Map<String, List<BusinessStoreWareDetailVO>> collect =
+        Map<String, List<BusinessStoreWareDetailDataVO>> collect =
                 storeWareDetailVOList.stream().collect(Collectors.groupingBy(this::fetchGroupKey));
 
 
-        Set<Map.Entry<String, List<BusinessStoreWareDetailVO>>> entries = collect.entrySet();
+        Set<Map.Entry<String, List<BusinessStoreWareDetailDataVO>>> entries = collect.entrySet();
 
-        for (Map.Entry<String, List<BusinessStoreWareDetailVO>> entry : entries) {
+        for (Map.Entry<String, List<BusinessStoreWareDetailDataVO>> entry : entries) {
             int sum = 0;
-            List<BusinessStoreWareDetailVO> value = entry.getValue();
-            List<String> collect1 = value.stream().map(BusinessStoreWareDetailVO::getInCount).collect(Collectors.toList());
+            List<BusinessStoreWareDetailDataVO> value = entry.getValue();
+            List<String> collect1 = value.stream().map(BusinessStoreWareDetailDataVO::getSettleQuantity).collect(Collectors.toList());
             for (String s : collect1) {
                 sum += Double.parseDouble(s);
             }
-            BusinessStoreWareDetailVO storeWareDetailVO = value.get(0);
-            storeWareDetailVO.setInCount(String.valueOf(sum));
+            BusinessStoreWareDetailDataVO storeWareDetailVO = value.get(0);
+            storeWareDetailVO.setSettleQuantity(String.valueOf(sum));
             list.add(storeWareDetailVO);
         }
 
 
-        vo.setStoreWareDetailVOList(list);
+        vo.setStoreWareDetailDataVOList(list);
 
         return vo;
 
@@ -195,8 +195,8 @@ public class BusinessFsOutConfirmServiceImpl extends ServiceImpl<BusinessFsOutCo
     }
 
 
-    private String fetchGroupKey(BusinessStoreWareDetailVO vo) {
-        return vo.getHouseId() + "_" + vo.getWarehouseId() + "_" + vo.getGrainKind() + "_" + vo.getGrainAttribute();
+    private String fetchGroupKey(BusinessStoreWareDetailDataVO vo) {
+        return vo.getBasicStorehouseId() + "_" + vo.getWarehouseId() + "_" + vo.getGrainVarietyId() + "_" + vo.getGrainNatureId();
     }
 
     /**
@@ -226,20 +226,20 @@ public class BusinessFsOutConfirmServiceImpl extends ServiceImpl<BusinessFsOutCo
         //通过确认单获取合同信息
         List<BusinessFsOutConfirmContractItem> businessFsOutConfirmContractItemList = businessFsOutConfirmContractItemMapper.selectList(new LambdaQueryWrapper<BusinessFsOutConfirmContractItem>()
                 .eq(BusinessFsOutConfirmContractItem::getFsOutConfirmId, businessFsOutConfirm.getId()));
-        List<BusinessStoreWareDetailVO> listVO = new ArrayList<>();
+        List<BusinessStoreWareDetailDataVO> listVO = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(businessFsOutConfirmContractItemList)) {
             for (BusinessFsOutConfirmContractItem businessFsOutConfirmContractItem : businessFsOutConfirmContractItemList) {
 
-                BusinessStoreWareDetailVO storeWareDetailVO = new BusinessStoreWareDetailVO();
-                storeWareDetailVO.setInCount(String.valueOf(businessFsOutConfirmContractItem.getSettleQuantity()));
-                storeWareDetailVO.setInPrice(String.valueOf(businessFsOutConfirmContractItem.getSettlePrice()));
-                storeWareDetailVO.setInDetailTotalPrice(String.valueOf(businessFsOutConfirmContractItem.getSettleAmount()));
+                BusinessStoreWareDetailDataVO storeWareDetailVO = new BusinessStoreWareDetailDataVO();
+                storeWareDetailVO.setSettleQuantity(String.valueOf(businessFsOutConfirmContractItem.getSettleQuantity()));
+                storeWareDetailVO.setSettlePrice(String.valueOf(businessFsOutConfirmContractItem.getSettlePrice()));
+                storeWareDetailVO.setSettleAmount(String.valueOf(businessFsOutConfirmContractItem.getSettleAmount()));
 
                 //设置仓房货位品种性质
                 BasicStorehouse basicStorehouse = basicStorehouseMapper.selectById(businessFsOutConfirmContractItem.getBasicStorehouseId());
                 if (ObjectUtils.isNotEmpty(basicStorehouse)) {
-                    storeWareDetailVO.setHouseId(businessFsOutConfirmContractItem.getBasicStorehouseId());
-                    storeWareDetailVO.setHouseName(basicStorehouse.getStorehouseName());
+                    storeWareDetailVO.setBasicStorehouseId(businessFsOutConfirmContractItem.getBasicStorehouseId());
+                    storeWareDetailVO.setBasicStorehouseName(basicStorehouse.getStorehouseName());
                 }
 
                 BasicWarehouse basicWarehouse = basicWarehouseMapper.selectById(businessFsOutConfirmContractItem.getWarehouseId());
@@ -250,19 +250,19 @@ public class BusinessFsOutConfirmServiceImpl extends ServiceImpl<BusinessFsOutCo
 
                 BasicEnum grainVariety = basicEnumMapper.selectById(businessFsOutConfirmContractItem.getGrainVarietyId());
                 if (ObjectUtils.isNotEmpty(grainVariety)) {
-                    storeWareDetailVO.setGrainKindName(grainVariety.getEnumname());
-                    storeWareDetailVO.setGrainKind(businessFsOutConfirmContractItem.getGrainVarietyId());
+                    storeWareDetailVO.setGrainVarietyName(grainVariety.getEnumname());
+                    storeWareDetailVO.setGrainVarietyId(businessFsOutConfirmContractItem.getGrainVarietyId());
                 }
                 BasicEnum grainNature = basicEnumMapper.selectById(businessFsOutConfirmContractItem.getGrainNatureId());
                 if (ObjectUtils.isNotEmpty(grainNature)) {
-                    storeWareDetailVO.setGrainAttribute(businessFsOutConfirmContractItem.getGrainNatureId());
-                    storeWareDetailVO.setGrainAttributeName(grainNature.getEnumname());
+                    storeWareDetailVO.setGrainNatureId(businessFsOutConfirmContractItem.getGrainNatureId());
+                    storeWareDetailVO.setGrainVarietyName(grainNature.getEnumname());
                 }
                 listVO.add(storeWareDetailVO);
 
             }
         }
-        vo.setStoreWareDetailVOList(listVO);
+        vo.setStoreWareDetailDataVOList(listVO);
 
         List<BusinessFsOutConfirmDiffPriceItem> fsOutConfirmDiffPriceItemList = businessFsOutConfirmDiffPriceItemMapper.selectList(new LambdaQueryWrapper<BusinessFsOutConfirmDiffPriceItem>()
                 .eq(BusinessFsOutConfirmDiffPriceItem::getFsOutConfirmId, businessFsOutConfirm.getId()));

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/vo/BusinessFsOutConfirmDetailVO.java

@@ -32,7 +32,7 @@ public class BusinessFsOutConfirmDetailVO extends BusinessFsOutConfirm{
 
 
     @ApiModelProperty(value = "合同详情")
-    private List<BusinessStoreWareDetailVO> storeWareDetailVOList;
+    private List<BusinessStoreWareDetailDataVO> storeWareDetailDataVOList;
 
 
     @ApiModelProperty(value = "差价上缴")

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/vo/BusinessStoreWareDetailDataVO.java

@@ -0,0 +1,47 @@
+package com.chinaitop.depot.intelligent.financialSupervision.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author hjc
+ * @date 2024/7/4 14:07
+ */
+@Data
+public class BusinessStoreWareDetailDataVO {
+
+    @ApiModelProperty(value = "basic_storehouse的id；仓房id")
+    private Integer basicStorehouseId;
+
+    @ApiModelProperty(value = "仓房名称")
+    private String basicStorehouseName;
+
+    @ApiModelProperty(value = "basic_warehouse的id；货位id;")
+    private Integer warehouseId;
+
+    @ApiModelProperty(value = "货位名称")
+    private String warehouseName;
+
+    @ApiModelProperty(value = "粮油品种id；basic_enum的id；")
+    private Integer grainVarietyId;
+
+    @ApiModelProperty(value = "粮油品种名称")
+    private String grainVarietyName;
+
+    @ApiModelProperty(value = "粮油性质；basic_enum的id；")
+    private Integer grainNatureId;
+
+    @ApiModelProperty(value = "粮油性质名称")
+    private String grainNatureName;
+
+    @ApiModelProperty(value = "结算数量")
+    private String settleQuantity;
+
+    @ApiModelProperty(value = "结算价格")
+    private String settlePrice;
+
+    @ApiModelProperty(value = "结算金额")
+    private String settleAmount;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/financialSupervision/vo/GetFsOutConfirmByContractVO.java

@@ -26,5 +26,5 @@ public class GetFsOutConfirmByContractVO {
 
 
     @ApiModelProperty(value = "合同详情")
-    private List<BusinessStoreWareDetailVO> storeWareDetailVOList;
+    private List<BusinessStoreWareDetailDataVO> storeWareDetailDataVOList;
 }