修改返回参数

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

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.intelligent.priceApproval.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaitop.depot.intelligent.common.ResponseEntity;
 import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
 import com.chinaitop.depot.intelligent.priceApproval.model.*;
@@ -80,7 +81,7 @@ public class BusinessFsSaleRevenueController {
 
     @GetMapping("/getCardInfo/{orgId}/{basicStorehouseId}/{warehouseId}")
     @ApiOperation(value = "原核定入库价格", notes = "原核定入库价格")
-    public ResponseEntity<List<BusinessFsSaleRevenueApprovalPrice>> getCardInfo(@PathVariable("orgId") Integer orgId,
+    public ResponseEntity<BusinessFsSaleRevenueApprovalPrice> getCardInfo(@PathVariable("orgId") Integer orgId,
                                                                      @PathVariable("basicStorehouseId") Integer basicStorehouseId,
                                                                      @PathVariable("warehouseId") Integer warehouseId) {
         return ResponseEntity.ok(saleRevenueService.getCardInfo(orgId, basicStorehouseId, warehouseId));
@@ -93,4 +94,29 @@ public class BusinessFsSaleRevenueController {
         return ResponseEntity.ok();
     }
 
+    @PostMapping("/details/{id}")
+    @ApiOperation(value = "销售收入上缴详情", notes = "详情")
+    public ResponseEntity details(@PathVariable("id") Integer id) {
+        return ResponseEntity.ok(saleRevenueService.detailsData(id));
+    }
+
+    @PostMapping("/update")
+    @ApiOperation(value = "销售收入上缴修改", notes = "修改")
+    public ResponseEntity update(@Validated @RequestBody BusinessFsSaleRevenue param) {
+        saleRevenueService.updateData(param);
+        return ResponseEntity.ok();
+    }
+
+    @GetMapping("/getPageList")
+    @ApiOperation(value = "分页列表", notes = "支持分页")
+    public ResponseEntity<Page<BusinessFsSaleRevenue>> getPageList(@Validated BusinessFsSaleRevenuePage param) {
+        return ResponseEntity.ok(saleRevenueService.selectPageList(param));
+    }
+
+    @PostMapping("/delete/{id}")
+    @ApiOperation(value = "销售收入上缴删除", notes = "删除")
+    public ResponseEntity delete(@PathVariable("id") Integer id) {
+        saleRevenueService.deleteData(id);
+        return ResponseEntity.ok();
+    }
 }

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

@@ -34,5 +34,5 @@ public interface BusinessFsSaleRevenueMapper extends BaseMapper<BusinessFsSaleRe
 
     List<BusinessFsSaleRevenueDiffPrice> getDiffPriceInfo(@Param("contractNumber") String contractNumber);
 
-    List<BusinessFsSaleRevenueApprovalPrice> getCardInfo(Map<String, Object> map);
+    BusinessFsSaleRevenueApprovalPrice getCardInfo(Map<String, Object> map);
 }

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

@@ -77,6 +77,10 @@ public class BusinessFsSaleRevenue implements Serializable {
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "合同信息")
+    @TableField(exist = false)
+    private List<BusinessContractDetail> contractDetails;
+
     @ApiModelProperty(value = "质检损益信息")
     @TableField(exist = false)
     private List<BusinessFsSaleRevenueInspectionLoss> inspectionLossList;

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

@@ -0,0 +1,25 @@
+package com.chinaitop.depot.intelligent.priceApproval.model;
+
+import com.chinaitop.depot.intelligent.common.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2024-07-25 17:58
+ */
+@Data
+public class BusinessFsSaleRevenuePage extends PageParam implements Serializable {
+    private static final long serialVersionUID = -5868563850694881293L;
+
+    @ApiModelProperty(value = "库区编码", required = true)
+    @NotNull(message = "机构编码不能为空")
+    private Integer orgId;
+    //合同编号
+    @ApiModelProperty(value = "合同编号")
+    private String contractNumber;
+}

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

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.intelligent.priceApproval.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
 import com.chinaitop.depot.intelligent.priceApproval.model.*;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -34,5 +35,13 @@ public interface BusinessFsSaleRevenueService extends IService<BusinessFsSaleRev
 
     List<BusinessFsSaleRevenueDiffPrice> getDiffPriceInfo(String contractNumber);
 
-    List<BusinessFsSaleRevenueApprovalPrice> getCardInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId);
+    BusinessFsSaleRevenueApprovalPrice getCardInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId);
+
+    void updateData(BusinessFsSaleRevenue param);
+
+    BusinessFsSaleRevenue detailsData(Integer id);
+
+    Page<BusinessFsSaleRevenue> selectPageList(BusinessFsSaleRevenuePage param);
+
+    void deleteData(Integer id);
 }

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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaitop.depot.intelligent.financialSupervision.model.BusinessFsOutConfirmDiffPriceItem;
 import com.chinaitop.depot.intelligent.priceApproval.mapper.*;
 import com.chinaitop.depot.intelligent.priceApproval.model.*;
@@ -102,7 +103,7 @@ public class BusinessFsSaleRevenueServiceImpl extends ServiceImpl<BusinessFsSale
     }
 
     @Override
-    public List<BusinessFsSaleRevenueApprovalPrice> getCardInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId) {
+    public BusinessFsSaleRevenueApprovalPrice getCardInfo(Integer orgId, Integer basicStorehouseId, Integer warehouseId) {
         Map<String, Object> map = new HashMap<>();
         map.put("orgId", orgId);
         map.put("basicStorehouseId", basicStorehouseId);
@@ -110,6 +111,41 @@ public class BusinessFsSaleRevenueServiceImpl extends ServiceImpl<BusinessFsSale
         return saleRevenueMapper.getCardInfo(map);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateData(BusinessFsSaleRevenue param) {
+
+    }
+
+    @Override
+    public BusinessFsSaleRevenue detailsData(Integer id) {
+        // 查询主表
+        BusinessFsSaleRevenue saleRevenue = saleRevenueMapper.selectById(id);
+        // 查询子表-质检损益信息
+        List<BusinessContractDetail> contractInfoList = this.getContractInfoList(saleRevenue.getContractId());
+        if (CollectionUtils.isNotEmpty(contractInfoList)) {
+            saleRevenue.setContractDetails(contractInfoList);
+        }
+        // 查询子表-三账一致性-会计账
+        // 查询子表-三账一致性-实际出库情况
+        // 查询子表-结算信息
+        // 查询子表-原核定入库价格
+        // 查询子表-差价上缴
+
+        return null;
+    }
+
+    @Override
+    public Page<BusinessFsSaleRevenue> selectPageList(BusinessFsSaleRevenuePage param) {
+        return null;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteData(Integer id) {
+
+    }
+
     // 保存子表-质检损益信息
     private void saveInspectionLoss(BusinessFsSaleRevenue param) {
         if (CollectionUtils.isNotEmpty(param.getInspectionLossList())) {

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

@@ -286,5 +286,8 @@
             sc.fill_org_id = #{orgId}
         AND sc.basic_storehouse_id = #{basicStorehouseId}
         AND sc.warehouse_id = #{warehouseId}
+        ORDER BY
+            sc.createdate
+        LIMIT 1
     </select>
 </mapper>