原核定入库价格

src/main/java/com/chinaitop/depot/intelligent/priceApproval/controller/BusinessFsSaleRevenueController.java

@@ -2,6 +2,7 @@ package com.chinaitop.depot.intelligent.priceApproval.controller;
 
 
 import com.chinaitop.depot.intelligent.common.ResponseEntity;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
 import com.chinaitop.depot.intelligent.priceApproval.model.*;
 import com.chinaitop.depot.intelligent.priceApproval.service.BusinessFsSaleRevenueService;
 import io.swagger.annotations.Api;
@@ -65,6 +66,26 @@ public class BusinessFsSaleRevenueController {
         return ResponseEntity.ok(saleRevenueService.getOutStorageDetailed(contractNumber));
     }
 
+    @GetMapping("/getSettlementInfo/{contractNumber}")
+    @ApiOperation(value = "结算信息", notes = "结算信息")
+    public ResponseEntity<List<BusinessFsSaleRevenueSettle>> getSettlementInfo(@PathVariable("contractNumber") String contractNumber) {
+        return ResponseEntity.ok(saleRevenueService.getSettlementInfo(contractNumber));
+    }
+
+    @GetMapping("/getDiffPriceInfo/{contractNumber}")
+    @ApiOperation(value = "差价上缴", notes = "差价上缴")
+    public ResponseEntity<List<BusinessFsSaleRevenueDiffPrice>> getDiffPriceInfo(@PathVariable("contractNumber") String contractNumber) {
+        return ResponseEntity.ok(saleRevenueService.getDiffPriceInfo(contractNumber));
+    }
+
+    @GetMapping("/getCardInfo/{orgId}/{basicStorehouseId}/{warehouseId}")
+    @ApiOperation(value = "原核定入库价格", notes = "原核定入库价格")
+    public ResponseEntity<List<BusinessFsSaleRevenueApprovalPrice>> getCardInfo(@PathVariable("orgId") Integer orgId,
+                                                                     @PathVariable("basicStorehouseId") Integer basicStorehouseId,
+                                                                     @PathVariable("warehouseId") Integer warehouseId) {
+        return ResponseEntity.ok(saleRevenueService.getCardInfo(orgId, basicStorehouseId, warehouseId));
+    }
+
     @PostMapping("/save")
     @ApiOperation(value = "销售收入上缴新增*", notes = "新增")
     public ResponseEntity save(@Validated @RequestBody BusinessFsSaleRevenue param) {

src/main/java/com/chinaitop/depot/intelligent/priceApproval/mapper/BusinessFsSaleRevenueMapper.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.intelligent.priceApproval.mapper;
 
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
 import com.chinaitop.depot.intelligent.priceApproval.model.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -28,4 +29,10 @@ public interface BusinessFsSaleRevenueMapper extends BaseMapper<BusinessFsSaleRe
     List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(@Param("contractNumber") String contractNumber);
 
     List<DataCPZ> getOutStorageDetailed(@Param("contractNumber") String contractNumber);
+
+    List<BusinessFsSaleRevenueSettle> getSettlementInfo(@Param("contractNumber") String contractNumber);
+
+    List<BusinessFsSaleRevenueDiffPrice> getDiffPriceInfo(@Param("contractNumber") String contractNumber);
+
+    List<BusinessFsSaleRevenueApprovalPrice> getCardInfo(Map<String, Object> map);
 }

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenueApprovalPrice.java

@@ -68,5 +68,19 @@ public class BusinessFsSaleRevenueApprovalPrice implements Serializable {
     @TableField("document_upload")
     private String documentUpload;
 
+    @ApiModelProperty(value = "仓房名称")
+    @TableField(exist = false)
+    private String storehouseName;
 
+    @ApiModelProperty(value = "货位名称")
+    @TableField(exist = false)
+    private String warehouseName;
+
+    @ApiModelProperty(value = "入库数量（公斤）")
+    @TableField(exist = false)
+    private BigDecimal lssl;
+
+    @ApiModelProperty(value = "核定单价（元）")
+    @TableField(exist = false)
+    private BigDecimal inNinancialVerification;
 }

src/main/java/com/chinaitop/depot/intelligent/priceApproval/model/BusinessFsSaleRevenueSettle.java

@@ -104,5 +104,11 @@ public class BusinessFsSaleRevenueSettle implements Serializable {
     @TableField("province_loan_return_amount")
     private BigDecimal provinceLoanReturnAmount;
 
+    // 业务数据
+    @ApiModelProperty(value = "出库验收确认-单位")
+    @TableField(exist = false)
+    private String orgName;
 
+    @ApiModelProperty(value = "贷款收回情况-日期")
+    private Date loanReturnTime;
 }

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/BusinessFsSaleRevenueService.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.intelligent.priceApproval.service;
 
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
 import com.chinaitop.depot.intelligent.priceApproval.model.*;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -28,4 +29,10 @@ public interface BusinessFsSaleRevenueService extends IService<BusinessFsSaleRev
     List<BusinessFsSaleRevenueThreeConsistence> getOutStorageInfo(String contractNumber);
 
     List<DataCPZ> getOutStorageDetailed(String contractNumber);
+
+    List<BusinessFsSaleRevenueSettle> getSettlementInfo(String contractNumber);
+
+    List<BusinessFsSaleRevenueDiffPrice> getDiffPriceInfo(String contractNumber);
+
+    List<BusinessFsSaleRevenueApprovalPrice> getCardInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId);
 }

src/main/java/com/chinaitop/depot/intelligent/priceApproval/service/impl/BusinessFsSaleRevenueServiceImpl.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.intelligent.priceApproval.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
 import com.chinaitop.depot.intelligent.priceApproval.mapper.*;
 import com.chinaitop.depot.intelligent.priceApproval.model.*;
 import com.chinaitop.depot.intelligent.priceApproval.service.BusinessFsSaleRevenueService;
@@ -87,6 +88,25 @@ public class BusinessFsSaleRevenueServiceImpl extends ServiceImpl<BusinessFsSale
         return saleRevenueMapper.getOutStorageDetailed(contractNumber);
     }
 
+    @Override
+    public List<BusinessFsSaleRevenueSettle> getSettlementInfo(String contractNumber) {
+        return saleRevenueMapper.getSettlementInfo(contractNumber);
+    }
+
+    @Override
+    public List<BusinessFsSaleRevenueDiffPrice> getDiffPriceInfo(String contractNumber) {
+        return saleRevenueMapper.getDiffPriceInfo(contractNumber);
+    }
+
+    @Override
+    public List<BusinessFsSaleRevenueApprovalPrice> getCardInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("orgId", orgId);
+        map.put("basicStorehouseId", basicStorehouseId);
+        map.put("warehouseId", warehouseId);
+        return saleRevenueMapper.getCardInfo(map);
+    }
+
     // 保存子表-质检损益信息
     private void saveInspectionLoss(BusinessFsSaleRevenue param) {
         if (CollectionUtils.isNotEmpty(param.getInspectionLossList())) {

src/main/resources/mapper/priceApproval/BusinessFsSaleRevenueMapper.xml

@@ -231,4 +231,60 @@
         WHERE
             cdIn.htbh = #{contractNumber}
     </select>
+    <select id="getSettlementInfo" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueSettle">
+        SELECT
+            oc.id fsOutConfirmId,
+            oi.org_name orgName,
+            (
+                oc.total_settle_quantity / 1000
+            ) provinceTotalSettleQuantity,
+            oc.total_settle_amount provinceTotalSettleAmount,
+            oc.loan_return_time loanReturnTime,
+            oc.loan_recovery_unit provinceLoanRecoveryUnit,
+            oc.loan_recovery_quantity provinceLoanRecoveryQuantity,
+            oc.loan_recovery_amount provinceLoanRecoveryAmount,
+            oc.invoice_unit provinceInvoiceUnit,
+            oc.invoice_quantity provinceInvoiceQuantity,
+            oc.invoice_unit_price provinceInvoiceUnitPrice,
+            oc.invoice_amount provinceInvoiceAmount,
+            oc.loan_return_time provinceLoanReturnTime,
+            oc.loan_return_amount provinceLoanReturnAmount
+        FROM
+            business_fs_out_confirm oc
+        LEFT JOIN business_contract bc ON bc.id = oc.contract_id
+        LEFT JOIN org_info oi ON oc.org_id = oi.org_id
+        WHERE
+            bc.contract_number = #{contractNumber}
+    </select>
+    <select id="getDiffPriceInfo" parameterType="string" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueDiffPrice">
+        SELECT
+            dpi.project_type projectType,
+            dpi.quantity totalQuantity,
+            dpi.amount totalAmount
+        FROM
+            business_fs_out_confirm_diff_price_item dpi
+        LEFT JOIN business_fs_out_confirm oc ON dpi.fs_out_confirm_id = oc.id
+        LEFT JOIN business_contract bc ON bc.id = oc.contract_id
+        WHERE
+            bc.contract_number = #{contractNumber}
+    </select>
+    <select id="getCardInfo" parameterType="map" resultType="com.chinaitop.depot.intelligent.priceApproval.model.BusinessFsSaleRevenueApprovalPrice">
+        SELECT
+            sc.id grainSituationCardId,
+            bs.storehouse_name storehouseName,
+            bw.warehouse_name warehouseName,
+            sc.lssl,
+            sc.in_financial_verification inNinancialVerification,
+            (
+                sc.in_financial_verification * sc.lssl
+            ) storageAmount
+        FROM
+            grain_situation_card sc
+        LEFT JOIN basic_storehouse bs ON bs.storehouse_id = sc.basic_storehouse_id
+        LEFT JOIN basic_warehouse bw ON sc.warehouse_id = bw.warehouse_id
+        WHERE
+            sc.fill_org_id = #{orgId}
+        AND sc.basic_storehouse_id = #{basicStorehouseId}
+        AND sc.warehouse_id = #{warehouseId}
+    </select>
 </mapper>