Merge branch 'dev-2.19.2' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/controller/FsSaleRevenueController.java

@@ -12,36 +12,30 @@
  */
 package com.unis.financialSupervision.modular.fsSaleRevenue.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.unis.financialSupervision.modular.priceApproval.entity.DataCPZ;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.unis.common.annotation.CommonLog;
 import com.unis.common.pojo.CommonResult;
-import com.unis.common.pojo.CommonValidList;
 import com.unis.financialSupervision.modular.fsSaleRevenue.entity.FsSaleRevenue;
-import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenueAddParam;
-import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenueEditParam;
 import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenueIdParam;
 import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenuePageParam;
 import com.unis.financialSupervision.modular.fsSaleRevenue.service.FsSaleRevenueService;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * 销售收入上缴控制器
  *
  * @author QSHan
- * @date  2024/07/29 14:04
+ * @date 2024/07/29 14:04
  */
 @Api(tags = "销售收入上缴控制器")
 @ApiSupport(author = "UNIS_TEAM", order = 1)
@@ -56,11 +50,11 @@ public class FsSaleRevenueController {
      * 获取销售收入上缴分页
      *
      * @author QSHan
-     * @date  2024/07/29 14:04
+     * @date 2024/07/29 14:04
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取销售收入上缴分页")
-    @SaCheckPermission("/financialSupervision/fsSaleRevenue/page")
+//    @SaCheckPermission("/financialSupervision/fsSaleRevenue/page")
     @GetMapping("/financialSupervision/fsSaleRevenue/page")
     public CommonResult<Page<FsSaleRevenue>> page(FsSaleRevenuePageParam fsSaleRevenuePageParam) {
         return CommonResult.data(fsSaleRevenueService.page(fsSaleRevenuePageParam));
@@ -70,32 +64,15 @@ public class FsSaleRevenueController {
      * 编辑销售收入上缴
      *
      * @author QSHan
-     * @date  2024/07/29 14:04
+     * @date 2024/07/29 14:04
      */
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑销售收入上缴")
     @CommonLog("编辑销售收入上缴")
-    @SaCheckPermission("/financialSupervision/fsSaleRevenue/edit")
+//    @SaCheckPermission("/financialSupervision/fsSaleRevenue/edit")
     @PostMapping("/financialSupervision/fsSaleRevenue/edit")
-    public CommonResult<String> edit(@RequestBody @Valid FsSaleRevenueEditParam fsSaleRevenueEditParam) {
-        fsSaleRevenueService.edit(fsSaleRevenueEditParam);
-        return CommonResult.ok();
-    }
-
-    /**
-     * 删除销售收入上缴
-     *
-     * @author QSHan
-     * @date  2024/07/29 14:04
-     */
-    @ApiOperationSupport(order = 4)
-    @ApiOperation("删除销售收入上缴")
-    @CommonLog("删除销售收入上缴")
-    @SaCheckPermission("/financialSupervision/fsSaleRevenue/delete")
-    @PostMapping("/financialSupervision/fsSaleRevenue/delete")
-    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
-                                                   CommonValidList<FsSaleRevenueIdParam> fsSaleRevenueIdParamList) {
-        fsSaleRevenueService.delete(fsSaleRevenueIdParamList);
+    public CommonResult<String> edit(@RequestBody @Valid FsSaleRevenue param) {
+        fsSaleRevenueService.edit(param);
         return CommonResult.ok();
     }
 
@@ -103,13 +80,19 @@ public class FsSaleRevenueController {
      * 获取销售收入上缴详情
      *
      * @author QSHan
-     * @date  2024/07/29 14:04
+     * @date 2024/07/29 14:04
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取销售收入上缴详情")
-    @SaCheckPermission("/financialSupervision/fsSaleRevenue/detail")
+//    @SaCheckPermission("/financialSupervision/fsSaleRevenue/detail")
     @GetMapping("/financialSupervision/fsSaleRevenue/detail")
     public CommonResult<FsSaleRevenue> detail(@Valid FsSaleRevenueIdParam fsSaleRevenueIdParam) {
         return CommonResult.data(fsSaleRevenueService.detail(fsSaleRevenueIdParam));
     }
+
+    @GetMapping("/financialSupervision/fsSaleRevenue/getOutStorageDetailed/{contractNumber}")
+    @ApiOperation(value = "三账一致性-出库明细", notes = "出库明细")
+    public CommonResult<List<DataCPZ>> getOutStorageDetailed(@PathVariable("contractNumber") String contractNumber) {
+        return CommonResult.data(fsSaleRevenueService.getOutStorageDetailed(contractNumber));
+    }
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/entity/FsSaleRevenue.java

@@ -22,7 +22,8 @@ import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistenceAccoun
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
+
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -35,7 +36,8 @@ import java.util.List;
 @Getter
 @Setter
 @TableName("business_fs_sale_revenue")
-public class FsSaleRevenue {
+public class FsSaleRevenue implements Serializable {
+    private static final long serialVersionUID = -3160238445247970639L;
 
     /** 主键ID */
     @TableId
@@ -138,4 +140,9 @@ public class FsSaleRevenue {
     @ApiModelProperty(value = "库区名称")
     @TableField(exist = false)
     private String orgName;
+
+    @ApiModelProperty(value = "合同附件")
+    @TableField(exist = false)
+    private String attachment;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/mapper/FsSaleRevenueMapper.java

@@ -12,18 +12,49 @@
  */
 package com.unis.financialSupervision.modular.fsSaleRevenue.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.unis.common.constant.DBConstant;
+import com.unis.financialSupervision.modular.fsSaleRevenue.entity.BusinessContractDetail;
 import com.unis.financialSupervision.modular.fsSaleRevenue.entity.FsSaleRevenue;
+import com.unis.financialSupervision.modular.fsSaleRevenueApprovalPrice.entity.FsSaleRevenueApprovalPrice;
+import com.unis.financialSupervision.modular.fsSaleRevenueDiffPrice.entity.FsSaleRevenueDiffPrice;
+import com.unis.financialSupervision.modular.fsSaleRevenueInspectionLoss.entity.FsSaleRevenueInspectionLoss;
+import com.unis.financialSupervision.modular.fsSaleRevenueSettle.entity.FsSaleRevenueSettle;
+import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistence.entity.FsSaleRevenueThreeConsistence;
+import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistenceAccount.entity.FsSaleRevenueThreeConsistenceAccount;
+import com.unis.financialSupervision.modular.priceApproval.entity.DataCPZ;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 销售收入上缴Mapper接口
  *
  * @author QSHan
  * @date 2024/07/29 14:04
  **/
+//@DS(DBConstant.DS_DEPOT)
 public interface FsSaleRevenueMapper extends BaseMapper<FsSaleRevenue> {
     Page<FsSaleRevenue> pageList(Page<Object> objectPage, @Param("ew") QueryWrapper<FsSaleRevenue> queryWrapper);
+
+    List<BusinessContractDetail> getContractInfoList(@Param("id") Integer id);
+
+    List<FsSaleRevenueThreeConsistenceAccount> getConsistenceAccountDetailsInfo(@Param("id") Integer id);
+
+    List<FsSaleRevenueInspectionLoss> getQualityDetailsInfo(@Param("id") Integer id);
+
+    List<FsSaleRevenueThreeConsistence> getOutStorageDetailsInfo(@Param("id") Integer id);
+
+    List<FsSaleRevenueSettle> getSettlementDetailsInfo(@Param("id") Integer id);
+
+    List<FsSaleRevenueApprovalPrice> getCardDetailsInfo(@Param("id") Integer id);
+
+    List<FsSaleRevenueDiffPrice> getDiffPriceDetailsInfo(@Param("id") Integer id);
+
+    List<DataCPZ> getOutStorageDetailed(@Param("contractNumber") String contractNumber);
+
+    FsSaleRevenue queryEntityById(@Param("id") Integer id);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/mapper/mapping/FsSaleRevenueMapper.xml

@@ -12,12 +12,199 @@
             bc.performance_quantity performanceQuantity,
             sr.createdate,
             sr.`status`,
-            sr.updatedate
+            sr.updatedate,
+            sr.report_time
         FROM
-            depot_qh.business_fs_sale_revenue sr
-        LEFT JOIN depot_qh.business_contract bc ON sr.contract_id = bc.id
-        LEFT JOIN depot_qh.org_info oi ON sr.org_id = oi.org_id
-        LEFT JOIN biz_unit_info ui ON ui.id = oi.unit_info_id
+            business_fs_sale_revenue sr
+        LEFT JOIN business_contract bc ON sr.contract_id = bc.id
+        LEFT JOIN org_info oi ON sr.org_id = oi.org_id
+        LEFT JOIN province_all.biz_unit_info ui ON ui.id = oi.unit_info_id
         ${ew.customSqlSegment}
     </select>
+    <select id="getContractInfoList" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenue.entity.BusinessContractDetail">
+        SELECT
+            swd.id,
+            bs.storehouse_name houseName,
+            bw.warehouse_name warehouseName,
+            swd.grain_kind grainKind,
+            be.enumname grainKindName,
+            swd.in_count inCount,
+            swd.in_price inPrice,
+            swd.in_detail_total_price inDetailTotalPrice
+        FROM
+            business_store_ware_detail swd
+        LEFT JOIN basic_enum be ON be.enumId = swd.grain_kind
+        LEFT JOIN basic_storehouse bs ON swd.house_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON swd.warehouse_id = bw.warehouse_id
+        WHERE
+            swd.zid = #{id}
+    </select>
+    <select id="getConsistenceAccountDetailsInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistenceAccount.entity.FsSaleRevenueThreeConsistenceAccount">
+        SELECT
+            tcc.id,
+            tcc. YEAR,
+            tcc. MONTH,
+            tcc.accounting_quantity accountingQuantity,
+            tcc.accounting_amount accountingAmount
+        FROM
+            business_fs_sale_revenue_three_consistence_account tcc
+        LEFT JOIN business_fs_sale_revenue sr ON sr.id = tcc.fs_sale_revenue_id
+        WHERE
+            tcc.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getQualityDetailsInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenueInspectionLoss.entity.FsSaleRevenueInspectionLoss">
+        SELECT
+            il.id,
+            il.qc_quality_inspection_id_out,
+            il.qc_quality_inspection_id_in,
+            bs.storehouse_name storehouseName,
+            bw.warehouse_name warehouseName,
+            t1.zzIn,
+            t1.sfIn,
+            t2.zzOut,
+            t2.sfOut,
+            il.gslr_loss_collect_id gslrLossCollectId,
+            lc.actual_loss_quantity actualLossQuantity,
+            (
+                lc.natural_loss + lc.moisture_loss + lc.impurity_reduction_quality
+            ) quotaLoss,
+            lc.natural_loss naturalLoss,
+            lc.moisture_loss moistureLoss,
+            lc.impurity_reduction_quality impurityReductionQuality,
+            lc.excess_loss_quantity excessLossQuantity,
+            lc.loss_profit_reason lossProfitReason
+        FROM
+            business_fs_sale_revenue_inspection_loss il
+        LEFT JOIN business_gslr_loss_collect lc ON lc.id = il.gslr_loss_collect_id
+        LEFT JOIN basic_storehouse bs ON lc.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON lc.warehouse_id = bw.warehouse_id
+        LEFT JOIN
+        (
+        SELECT
+            qi.id,
+            SUM(CASE WHEN qii.inspection_item_id = 7619 THEN qii.inspection_value ELSE 0 END) zzIn,
+          SUM(CASE WHEN qii.inspection_item_id = 9528239 THEN qii.inspection_value ELSE 0 END) sfIn
+        FROM
+            business_fs_sale_revenue_inspection_loss il
+        LEFT JOIN business_qc_quality_inspection qi ON il.qc_quality_inspection_id_out = qi.id
+        LEFT JOIN business_qc_quality_inspection_item qii ON qi.id = qii.qc_quality_inspection_id
+        ) t1 ON il.qc_quality_inspection_id_in = t1.id
+        LEFT JOIN
+        (
+        SELECT
+            qi.id,
+            SUM(CASE WHEN qii.inspection_item_id = 7619 THEN qii.inspection_value ELSE 0 END) zzOut,
+          SUM(CASE WHEN qii.inspection_item_id = 9528239 THEN qii.inspection_value ELSE 0 END) sfOut
+        FROM
+            business_fs_sale_revenue_inspection_loss il
+        LEFT JOIN business_qc_quality_inspection qi ON il.qc_quality_inspection_id_out = qi.id
+        LEFT JOIN business_qc_quality_inspection_item qii ON qi.id = qii.qc_quality_inspection_id
+        ) t2 ON il.qc_quality_inspection_id_out = t2.id
+        WHERE
+            il.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getOutStorageDetailsInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistence.entity.FsSaleRevenueThreeConsistence">
+        SELECT
+            tc.id,
+            tc.`year`,
+            tc.`month`,
+            tc.basic_storehouse_id,
+            tc.warehouse_id,
+            bs.storehouse_name storehouseName,
+            bw.warehouse_name warehouseName,
+            tc.loss,
+            tc.custody_account_quantity,
+            tc.statistical_account_quantity,
+            tc.complete_time
+        FROM
+            business_fs_sale_revenue_three_consistence tc
+        LEFT JOIN basic_storehouse bs ON tc.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON tc.warehouse_id = bw.warehouse_id
+        WHERE
+            tc.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getSettlementDetailsInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenueSettle.entity.FsSaleRevenueSettle">
+        SELECT
+            rs.id,
+            rs.province_acceptance_unit,
+            rs.province_total_settle_quantity,
+            rs.province_total_settle_amount,
+            rs.province_loan_return_time loanReturnTime,
+            rs.province_loan_recovery_unit provinceLoanRecoveryUnit,
+            rs.province_loan_recovery_quantity provinceLoanRecoveryQuantity,
+            rs.province_loan_recovery_amount provinceLoanRecoveryAmount,
+            rs.province_invoice_unit provinceInvoiceUnit,
+            rs.province_invoice_quantity provinceInvoiceQuantity,
+            rs.province_invoice_unit_price provinceInvoiceUnitPrice,
+            rs.province_invoice_amount provinceInvoiceAmount,
+            rs.province_loan_return_time provinceLoanReturnTime,
+            rs.province_loan_return_amount provinceLoanReturnAmount,
+            rs.fs_out_confirm_id fsOutConfirmId
+        FROM
+            business_fs_sale_revenue_settle rs
+        WHERE
+            rs.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getCardDetailsInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenueApprovalPrice.entity.FsSaleRevenueApprovalPrice">
+        SELECT
+            ap.id,
+            sc.basic_storehouse_id storehouseId,
+            bs.storehouse_name storehouseName,
+            sc.warehouse_id warehouseId,
+            bw.warehouse_name warehouseName,
+            sc.lssl,
+            sc.in_financial_verification inNinancialVerification,
+            ap.storage_amount storageAmount,
+            ap.document_number,
+            ap.document_upload,
+            ap.grain_situation_card_id,
+	        ap.fs_sale_revenue_id
+        FROM
+            business_fs_sale_revenue_approval_price ap
+        LEFT JOIN grain_situation_card sc ON ap.grain_situation_card_id = sc.id
+        LEFT JOIN basic_storehouse bs ON sc.basic_storehouse_id = bs.storehouse_id
+        LEFT JOIN basic_warehouse bw ON sc.warehouse_id = bw.warehouse_id
+        WHERE
+            ap.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getDiffPriceDetailsInfo" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenueDiffPrice.entity.FsSaleRevenueDiffPrice">
+        SELECT
+            dp.id,
+            dp.project_type projectType,
+            dp.total_quantity totalQuantity,
+            dp.total_amount totalAmount
+        FROM
+            business_fs_sale_revenue_diff_price dp
+        WHERE
+            dp.fs_sale_revenue_id = #{id}
+    </select>
+    <select id="getOutStorageDetailed" parameterType="string" resultType="com.unis.financialSupervision.modular.priceApproval.entity.DataCPZ">
+        SELECT
+            cdIn.htbh,
+            cdIn2.sjckchmc storehouseName,
+            cdIn2.sjhwhmc warehouseName,
+            cdIn.cph qcph,
+            cdIn2.mz mzzl,
+            cdIn3.pz,
+            cdIn2.klhjz bzwkl,
+            cdIn.djsj cpzsj
+        FROM
+            data_crkyw_ckrmdj_default cdIn
+        LEFT JOIN data_crkyw_ckcmz_default cdIn2 ON cdIn.BizNo = cdIn2.BizNo
+        LEFT JOIN data_crkyw_ckcpz_default cdIn3 ON cdIn.BizNo = cdIn3.BizNo
+        WHERE
+            cdIn.htbh = #{contractNumber}
+    </select>
+    <select id="queryEntityById" parameterType="integer" resultType="com.unis.financialSupervision.modular.fsSaleRevenue.entity.FsSaleRevenue">
+        SELECT
+            sr.*, bc.contract_number contractNumber,
+            bc.attachment,
+	        oi.org_name orgName
+        FROM
+            business_fs_sale_revenue sr
+        LEFT JOIN business_contract bc ON sr.contract_id = bc.id
+        LEFT JOIN org_info oi ON oi.org_id = sr.org_id
+        WHERE
+            sr.id = #{id}
+    </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/param/FsSaleRevenueIdParam.java

@@ -17,6 +17,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 销售收入上缴Id参数
@@ -30,6 +31,6 @@ public class FsSaleRevenueIdParam {
 
     /** 主键ID */
     @ApiModelProperty(value = "主键ID", required = true)
-    @NotBlank(message = "id不能为空")
+    @NotNull(message = "id不能为空")
     private Integer id;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/service/FsSaleRevenueService.java

@@ -19,6 +19,7 @@ import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenueAd
 import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenueEditParam;
 import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenueIdParam;
 import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenuePageParam;
+import com.unis.financialSupervision.modular.priceApproval.entity.DataCPZ;
 
 import java.util.List;
 
@@ -44,15 +45,7 @@ public interface FsSaleRevenueService extends IService<FsSaleRevenue> {
      * @author QSHan
      * @date  2024/07/29 14:04
      */
-    void edit(FsSaleRevenueEditParam fsSaleRevenueEditParam);
-
-    /**
-     * 删除销售收入上缴
-     *
-     * @author QSHan
-     * @date  2024/07/29 14:04
-     */
-    void delete(List<FsSaleRevenueIdParam> fsSaleRevenueIdParamList);
+    void edit(FsSaleRevenue param);
 
     /**
      * 获取销售收入上缴详情
@@ -63,10 +56,9 @@ public interface FsSaleRevenueService extends IService<FsSaleRevenue> {
     FsSaleRevenue detail(FsSaleRevenueIdParam fsSaleRevenueIdParam);
 
     /**
-     * 获取销售收入上缴详情
-     *
-     * @author QSHan
-     * @date  2024/07/29 14:04
-     **/
-    FsSaleRevenue queryEntity(Integer id);
+     * 获取出入库明细
+     * @param contractNumber 合同编号
+     * @return list
+     */
+    List<DataCPZ> getOutStorageDetailed(String contractNumber);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenue/service/impl/FsSaleRevenueServiceImpl.java

@@ -16,10 +16,27 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.unis.common.constant.DBConstant;
+import com.unis.financialSupervision.modular.fsSaleRevenue.entity.BusinessContractDetail;
+import com.unis.financialSupervision.modular.fsSaleRevenueApprovalPrice.entity.FsSaleRevenueApprovalPrice;
+import com.unis.financialSupervision.modular.fsSaleRevenueApprovalPrice.mapper.FsSaleRevenueApprovalPriceMapper;
+import com.unis.financialSupervision.modular.fsSaleRevenueDiffPrice.entity.FsSaleRevenueDiffPrice;
+import com.unis.financialSupervision.modular.fsSaleRevenueDiffPrice.mapper.FsSaleRevenueDiffPriceMapper;
+import com.unis.financialSupervision.modular.fsSaleRevenueInspectionLoss.entity.FsSaleRevenueInspectionLoss;
+import com.unis.financialSupervision.modular.fsSaleRevenueInspectionLoss.mapper.FsSaleRevenueInspectionLossMapper;
+import com.unis.financialSupervision.modular.fsSaleRevenueSettle.entity.FsSaleRevenueSettle;
+import com.unis.financialSupervision.modular.fsSaleRevenueSettle.mapper.FsSaleRevenueSettleMapper;
+import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistence.entity.FsSaleRevenueThreeConsistence;
+import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistence.mapper.FsSaleRevenueThreeConsistenceMapper;
+import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistenceAccount.entity.FsSaleRevenueThreeConsistenceAccount;
+import com.unis.financialSupervision.modular.fsSaleRevenueThreeConsistenceAccount.mapper.FsSaleRevenueThreeConsistenceAccountMapper;
+import com.unis.financialSupervision.modular.priceApproval.entity.DataCPZ;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.unis.common.enums.CommonSortOrderEnum;
@@ -34,6 +51,7 @@ import com.unis.financialSupervision.modular.fsSaleRevenue.param.FsSaleRevenuePa
 import com.unis.financialSupervision.modular.fsSaleRevenue.service.FsSaleRevenueService;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -43,9 +61,22 @@ import java.util.List;
  * @date  2024/07/29 14:04
  **/
 @Service
+@DS(DBConstant.DS_DEPOT)
 public class FsSaleRevenueServiceImpl extends ServiceImpl<FsSaleRevenueMapper, FsSaleRevenue> implements FsSaleRevenueService {
     @Resource
-    private FsSaleRevenueMapper revenueMapper;
+    private FsSaleRevenueMapper saleRevenueMapper;
+    @Resource
+    private FsSaleRevenueInspectionLossMapper saleRevenueInspectionLossMapper;
+    @Resource
+    private FsSaleRevenueThreeConsistenceAccountMapper threeConsistenceAccountMapper;
+    @Resource
+    private FsSaleRevenueThreeConsistenceMapper threeConsistenceMapper;
+    @Resource
+    private FsSaleRevenueSettleMapper settleMapper;
+    @Resource
+    private FsSaleRevenueApprovalPriceMapper approvalPriceMapper;
+    @Resource
+    private FsSaleRevenueDiffPriceMapper diffPriceMapper;
 
     @Override
     public Page<FsSaleRevenue> page(FsSaleRevenuePageParam fsSaleRevenuePageParam) {
@@ -65,35 +96,122 @@ public class FsSaleRevenueServiceImpl extends ServiceImpl<FsSaleRevenueMapper, F
         } else {
             queryWrapper.lambda().orderByDesc(FsSaleRevenue::getId);
         }
-        return revenueMapper.pageList(CommonPageRequest.defaultPage(), queryWrapper);
+        return saleRevenueMapper.pageList(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void edit(FsSaleRevenueEditParam fsSaleRevenueEditParam) {
-        FsSaleRevenue fsSaleRevenue = this.queryEntity(fsSaleRevenueEditParam.getId());
-        BeanUtil.copyProperties(fsSaleRevenueEditParam, fsSaleRevenue);
-        this.updateById(fsSaleRevenue);
-    }
+    public void edit(FsSaleRevenue param) {
+        // 修改主表
+        this.updateById(param);
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void delete(List<FsSaleRevenueIdParam> fsSaleRevenueIdParamList) {
-        // 执行删除
-        this.removeByIds(CollStreamUtil.toList(fsSaleRevenueIdParamList, FsSaleRevenueIdParam::getId));
+        // 修改子表-质检损益信息
+        this.inspectionLossUpdate(param.getInspectionLossList());
+
+        // 修改子表-三账一致性-会计账
+        this.threeConsistenceAccountUpdate(param.getThreeConsistenceAccountList());
+
+        // 修改子表-三账一致性-实际出库情况
+        this.threeConsistenceUpdate(param.getThreeConsistenceList());
+
+        // 修改子表-结算信息
+        this.revenueSettleUpdate(param.getRevenueSettleList());
+
+        // 修改子表-原核定入库价格
+        this.approvalPriceUpdate(param.getApprovalPriceList());
+
+        // 修改子表-差价上缴
+        this.diffPriceUpdate(param.getDiffPriceList());
     }
 
     @Override
     public FsSaleRevenue detail(FsSaleRevenueIdParam fsSaleRevenueIdParam) {
-        return this.queryEntity(fsSaleRevenueIdParam.getId());
+        // 查询主表
+        FsSaleRevenue saleRevenue = saleRevenueMapper.queryEntityById(fsSaleRevenueIdParam.getId());
+
+        // 查询子表-合同信息
+        List<BusinessContractDetail> contractInfoList = saleRevenueMapper.getContractInfoList(saleRevenue.getContractId());
+        if (CollectionUtils.isNotEmpty(contractInfoList)) {
+            saleRevenue.setContractDetails(contractInfoList);
+        }
+        // 查询子表-质检损益信息
+        List<FsSaleRevenueInspectionLoss> inspectionLossList = saleRevenueMapper.getQualityDetailsInfo(fsSaleRevenueIdParam.getId());
+        if (CollectionUtils.isNotEmpty(inspectionLossList)) {
+            saleRevenue.setInspectionLossList(inspectionLossList);
+        }
+        // 查询子表-三账一致性-会计账
+        List<FsSaleRevenueThreeConsistenceAccount> threeConsistenceList = saleRevenueMapper.getConsistenceAccountDetailsInfo(fsSaleRevenueIdParam.getId());
+        if (CollectionUtils.isNotEmpty(threeConsistenceList)) {
+            saleRevenue.setThreeConsistenceAccountList(threeConsistenceList);
+        }
+        // 查询子表-三账一致性-实际出库情况
+        List<FsSaleRevenueThreeConsistence> outStorageDetailsInfo = saleRevenueMapper.getOutStorageDetailsInfo(fsSaleRevenueIdParam.getId());
+        if (CollectionUtils.isNotEmpty(outStorageDetailsInfo)) {
+            saleRevenue.setThreeConsistenceList(outStorageDetailsInfo);
+        }
+        // 查询子表-结算信息
+        List<FsSaleRevenueSettle> revenueSettleList = saleRevenueMapper.getSettlementDetailsInfo(fsSaleRevenueIdParam.getId());
+        if (CollectionUtils.isNotEmpty(revenueSettleList)) {
+            saleRevenue.setRevenueSettleList(revenueSettleList);
+        }
+        // 查询子表-原核定入库价格
+        List<FsSaleRevenueApprovalPrice> approvalPriceList = saleRevenueMapper.getCardDetailsInfo(fsSaleRevenueIdParam.getId());
+        if (CollectionUtils.isNotEmpty(approvalPriceList)) {
+            saleRevenue.setApprovalPriceList(approvalPriceList);
+        }
+        // 查询子表-差价上缴
+        List<FsSaleRevenueDiffPrice> DiffPriceList = saleRevenueMapper.getDiffPriceDetailsInfo(fsSaleRevenueIdParam.getId());
+        if (CollectionUtils.isNotEmpty(DiffPriceList)) {
+            saleRevenue.setDiffPriceList(DiffPriceList);
+        }
+
+        return saleRevenue;
     }
 
     @Override
-    public FsSaleRevenue queryEntity(Integer id) {
-        FsSaleRevenue fsSaleRevenue = this.getById(id);
-        if(ObjectUtil.isEmpty(fsSaleRevenue)) {
-            throw new CommonException("销售收入上缴不存在，id值为：{}", id);
+    public List<DataCPZ> getOutStorageDetailed(String contractNumber) {
+        return saleRevenueMapper.getOutStorageDetailed(contractNumber);
+    }
+
+    // 修改子表-质检损益信息
+    private void inspectionLossUpdate(List<FsSaleRevenueInspectionLoss> inspectionLossList) {
+        if (CollectionUtils.isNotEmpty(inspectionLossList)) {
+            inspectionLossList.forEach(inspectionLoss -> saleRevenueInspectionLossMapper.updateById(inspectionLoss));
+        }
+    }
+
+    // 修改子表-三账一致性-会计账
+    private void threeConsistenceAccountUpdate(List<FsSaleRevenueThreeConsistenceAccount> threeConsistenceAccountList) {
+        if (CollectionUtils.isNotEmpty(threeConsistenceAccountList)) {
+            threeConsistenceAccountList.forEach(threeConsistenceAccount -> threeConsistenceAccountMapper.updateById(threeConsistenceAccount));
+        }
+    }
+
+    // 修改子表-三账一致性-实际出库情况
+    private void threeConsistenceUpdate(List<FsSaleRevenueThreeConsistence> threeConsistenceList) {
+        if (CollectionUtils.isNotEmpty(threeConsistenceList)) {
+            threeConsistenceList.forEach(threeConsistence -> threeConsistenceMapper.updateById(threeConsistence));
+        }
+    }
+
+    // 修改子表-结算信息
+    private void revenueSettleUpdate(List<FsSaleRevenueSettle> revenueSettleList) {
+        if (CollectionUtils.isNotEmpty(revenueSettleList)) {
+            revenueSettleList.forEach(revenueSettle -> settleMapper.updateById(revenueSettle));
+        }
+    }
+
+    // 修改子表-原核定入库价格
+    private void approvalPriceUpdate(List<FsSaleRevenueApprovalPrice> approvalPriceList) {
+        if (CollectionUtils.isNotEmpty(approvalPriceList)) {
+            approvalPriceList.forEach(approvalPrice -> approvalPriceMapper.updateById(approvalPrice));
+        }
+    }
+
+    // 修改子表-差价上缴
+    private void diffPriceUpdate(List<FsSaleRevenueDiffPrice> DiffPriceList) {
+        if (CollectionUtils.isNotEmpty(DiffPriceList)) {
+            DiffPriceList.forEach(DiffPrice -> diffPriceMapper.updateById(DiffPrice));
         }
-        return fsSaleRevenue;
     }
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsSaleRevenueThreeConsistenceAccount/entity/FsSaleRevenueThreeConsistenceAccount.java

@@ -57,7 +57,7 @@ public class FsSaleRevenueThreeConsistenceAccount {
 
     /** 年 */
     @ApiModelProperty(value = "年", position = 7)
-    private Date year;
+    private Integer year;
 
     /** 月份 */
     @ApiModelProperty(value = "月份", position = 8)