Merge remote-tracking branch 'remotes/origin/dev-2.19.2' into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsEnterpriseBalanceStatistic/mapper/FsEnterpriseBalanceStatisticMapper.java

@@ -24,7 +24,6 @@ import com.unis.financialSupervision.modular.fsEnterpriseBalanceStatistic.entity
 import com.unis.financialSupervision.modular.fsEnterpriseBalanceStatistic.param.CostBalanceParam;
 import com.unis.financialSupervision.modular.fsEnterpriseBalanceStatistic.param.FsEnterpriseBalanceStatisticPageParam;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/controller/BusinessFsInterestMaintainController.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.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.common.pojo.CommonValidList;
+import com.unis.financialSupervision.modular.fsinterestmaintain.entity.BusinessFsInterestMaintain;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainAddParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainEditParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainIdParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainPageParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.service.BusinessFsInterestMaintainService;
+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 com.unis.common.annotation.CommonLog;
+import com.unis.common.pojo.CommonResult;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 财务监管-利息维护控制器
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ */
+@Api(tags = "财务监管-利息维护控制器")
+@ApiSupport(author = "UNIS_TEAM", order = 1)
+@RestController
+@Validated
+public class BusinessFsInterestMaintainController {
+
+    @Resource
+    private BusinessFsInterestMaintainService businessFsInterestMaintainService;
+
+    /**
+     * 获取财务监管-利息维护分页
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("获取财务监管-利息维护分页")
+    @SaCheckPermission("/finishedGrainSupervision/fsinterestmaintain/page")
+    @GetMapping("/finishedGrainSupervision/fsinterestmaintain/page")
+    public CommonResult<Page<BusinessFsInterestMaintain>> page(BusinessFsInterestMaintainPageParam businessFsInterestMaintainPageParam) {
+        return CommonResult.data(businessFsInterestMaintainService.page(businessFsInterestMaintainPageParam));
+    }
+
+    /**
+     * 添加财务监管-利息维护
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    @ApiOperationSupport(order = 2)
+    @ApiOperation("添加财务监管-利息维护")
+    @CommonLog("添加财务监管-利息维护")
+    @SaCheckPermission("/finishedGrainSupervision/fsinterestmaintain/add")
+    @PostMapping("/finishedGrainSupervision/fsinterestmaintain/add")
+    public CommonResult<String> add(@RequestBody @Valid BusinessFsInterestMaintainAddParam businessFsInterestMaintainAddParam) {
+        businessFsInterestMaintainService.add(businessFsInterestMaintainAddParam);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 编辑财务监管-利息维护
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("编辑财务监管-利息维护")
+    @CommonLog("编辑财务监管-利息维护")
+    @SaCheckPermission("/finishedGrainSupervision/fsinterestmaintain/edit")
+    @PostMapping("/finishedGrainSupervision/fsinterestmaintain/edit")
+    public CommonResult<String> edit(@RequestBody @Valid BusinessFsInterestMaintainEditParam businessFsInterestMaintainEditParam) {
+        businessFsInterestMaintainService.edit(businessFsInterestMaintainEditParam);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 删除财务监管-利息维护
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    @ApiOperationSupport(order = 4)
+    @ApiOperation("删除财务监管-利息维护")
+    @CommonLog("删除财务监管-利息维护")
+    @SaCheckPermission("/finishedGrainSupervision/fsinterestmaintain/delete")
+    @PostMapping("/finishedGrainSupervision/fsinterestmaintain/delete")
+    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
+                                               CommonValidList<BusinessFsInterestMaintainIdParam> businessFsInterestMaintainIdParamList) {
+        businessFsInterestMaintainService.delete(businessFsInterestMaintainIdParamList);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 获取财务监管-利息维护详情
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("获取财务监管-利息维护详情")
+    @SaCheckPermission("/finishedGrainSupervision/fsinterestmaintain/detail")
+    @GetMapping("/finishedGrainSupervision/fsinterestmaintain/detail")
+    public CommonResult<BusinessFsInterestMaintain> detail(@Valid BusinessFsInterestMaintainIdParam businessFsInterestMaintainIdParam) {
+        return CommonResult.data(businessFsInterestMaintainService.detail(businessFsInterestMaintainIdParam));
+    }
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/entity/BusinessFsInterestMaintain.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 财务监管-利息维护实体
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ **/
+@Getter
+@Setter
+@TableName("business_fs_interest_maintain")
+public class BusinessFsInterestMaintain {
+
+    /** 主键ID */
+    @TableId
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** 粮库id；org_info的id； */
+    @ApiModelProperty(value = "粮库id；org_info的id；", position = 6)
+    private Integer orgId;
+
+    /** 利息单号 */
+    @ApiModelProperty(value = "利息单号", position = 7)
+    private String interestBillNo;
+
+    /** 年 */
+    @ApiModelProperty(value = "年", position = 8)
+    private Integer year;
+
+    /** 月 */
+    @ApiModelProperty(value = "月", position = 9)
+    private Integer month;
+
+    /** 农发行实收利息；单位：万元； */
+    @ApiModelProperty(value = "农发行实收利息；单位：万元；", position = 10)
+    private BigDecimal actualInterestReceived;
+
+    /** 对其他扣款；单位：万元； */
+    @ApiModelProperty(value = "对其他扣款；单位：万元；", position = 11)
+    private BigDecimal otherDeduction;
+
+    /** 备注 */
+    @ApiModelProperty(value = "备注", position = 12)
+    private String remark;
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/enums/BusinessFsInterestMaintainEnum.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.enums;
+
+import lombok.Getter;
+
+/**
+ * 财务监管-利息维护枚举
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ **/
+@Getter
+public enum BusinessFsInterestMaintainEnum {
+
+    /** 测试 */
+    TEST("TEST");
+
+    private final String value;
+
+    BusinessFsInterestMaintainEnum(String value) {
+        this.value = value;
+    }
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/mapper/BusinessFsInterestMaintainMapper.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.unis.financialSupervision.modular.fsinterestmaintain.entity.BusinessFsInterestMaintain;
+import com.unis.financialSupervision.modular.fsinterestsubsidysettle.entity.FsInterestSubsidySettle;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 财务监管-利息维护Mapper接口
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ **/
+public interface BusinessFsInterestMaintainMapper extends BaseMapper<BusinessFsInterestMaintain> {
+    List<FsInterestSubsidySettle> finfByYear(@Param("planYear") Integer planYear);
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/mapper/mapping/BusinessFsInterestMaintainMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.unis.financialSupervision.modular.fsinterestmaintain.mapper.BusinessFsInterestMaintainMapper">
+
+    <select id="finfByYear"
+            resultType="com.unis.financialSupervision.modular.fsinterestsubsidysettle.entity.FsInterestSubsidySettle">
+        SELECT
+            org_id,
+            year,
+            SUM(actual_interest_received) actual_interest_received,
+            SUM(other_deduction) other_deduction
+        FROM
+            business_fs_interest_maintain
+        where year=#{year}
+        GROUP BY org_id
+
+    </select>
+</mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/param/BusinessFsInterestMaintainAddParam.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 财务监管-利息维护添加参数
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ **/
+@Getter
+@Setter
+public class BusinessFsInterestMaintainAddParam {
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** 粮库id；org_info的id； */
+    @ApiModelProperty(value = "粮库id；org_info的id；", position = 6)
+    private Integer orgId;
+
+    /** 利息单号 */
+    @ApiModelProperty(value = "利息单号", position = 7)
+    private String interestBillNo;
+
+    /** 年 */
+    @ApiModelProperty(value = "年", position = 8)
+    private Integer year;
+
+    /** 月 */
+    @ApiModelProperty(value = "月", position = 9)
+    private Integer month;
+
+    /** 农发行实收利息；单位：万元； */
+    @ApiModelProperty(value = "农发行实收利息；单位：万元；", position = 10)
+    private BigDecimal actualInterestReceived;
+
+    /** 对其他扣款；单位：万元； */
+    @ApiModelProperty(value = "对其他扣款；单位：万元；", position = 11)
+    private BigDecimal otherDeduction;
+
+    /** 备注 */
+    @ApiModelProperty(value = "备注", position = 12)
+    private String remark;
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/param/BusinessFsInterestMaintainEditParam.java

@@ -0,0 +1,83 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 财务监管-利息维护编辑参数
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ **/
+@Getter
+@Setter
+public class BusinessFsInterestMaintainEditParam {
+
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 2)
+    private String createname;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 3)
+    private Date createdate;
+
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人", position = 4)
+    private String updatename;
+
+    /** 更新日期 */
+    @ApiModelProperty(value = "更新日期", position = 5)
+    private Date updatedate;
+
+    /** 粮库id；org_info的id； */
+    @ApiModelProperty(value = "粮库id；org_info的id；", position = 6)
+    private Integer orgId;
+
+    /** 利息单号 */
+    @ApiModelProperty(value = "利息单号", position = 7)
+    private String interestBillNo;
+
+    /** 年 */
+    @ApiModelProperty(value = "年", position = 8)
+    private Integer year;
+
+    /** 月 */
+    @ApiModelProperty(value = "月", position = 9)
+    private Integer month;
+
+    /** 农发行实收利息；单位：万元； */
+    @ApiModelProperty(value = "农发行实收利息；单位：万元；", position = 10)
+    private BigDecimal actualInterestReceived;
+
+    /** 对其他扣款；单位：万元； */
+    @ApiModelProperty(value = "对其他扣款；单位：万元；", position = 11)
+    private BigDecimal otherDeduction;
+
+    /** 备注 */
+    @ApiModelProperty(value = "备注", position = 12)
+    private String remark;
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/param/BusinessFsInterestMaintainIdParam.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 财务监管-利息维护Id参数
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ **/
+@Getter
+@Setter
+public class BusinessFsInterestMaintainIdParam {
+
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
+    @NotBlank(message = "id不能为空")
+    private Integer id;
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/param/BusinessFsInterestMaintainPageParam.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 财务监管-利息维护查询参数
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ **/
+@Getter
+@Setter
+public class BusinessFsInterestMaintainPageParam {
+
+    /** 当前页 */
+    @ApiModelProperty(value = "当前页码")
+    private Integer current;
+
+    /** 每页条数 */
+    @ApiModelProperty(value = "每页条数")
+    private Integer size;
+
+    /** 排序字段 */
+    @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
+    private String sortField;
+
+    /** 排序方式 */
+    @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
+    private String sortOrder;
+
+    /** 关键词 */
+    @ApiModelProperty(value = "关键词")
+    private String searchKey;
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/service/BusinessFsInterestMaintainService.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.unis.financialSupervision.modular.fsinterestmaintain.entity.BusinessFsInterestMaintain;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainAddParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainEditParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainIdParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainPageParam;
+import com.unis.financialSupervision.modular.fsinterestsubsidysettle.entity.FsInterestSubsidySettle;
+
+
+import java.util.List;
+
+/**
+ * 财务监管-利息维护Service接口
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ **/
+public interface BusinessFsInterestMaintainService extends IService<BusinessFsInterestMaintain> {
+
+    /**
+     * 获取财务监管-利息维护分页
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    Page<BusinessFsInterestMaintain> page(BusinessFsInterestMaintainPageParam businessFsInterestMaintainPageParam);
+
+    /**
+     * 添加财务监管-利息维护
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    void add(BusinessFsInterestMaintainAddParam businessFsInterestMaintainAddParam);
+
+    /**
+     * 编辑财务监管-利息维护
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    void edit(BusinessFsInterestMaintainEditParam businessFsInterestMaintainEditParam);
+
+    /**
+     * 删除财务监管-利息维护
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    void delete(List<BusinessFsInterestMaintainIdParam> businessFsInterestMaintainIdParamList);
+
+    /**
+     * 获取财务监管-利息维护详情
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     */
+    BusinessFsInterestMaintain detail(BusinessFsInterestMaintainIdParam businessFsInterestMaintainIdParam);
+
+    /**
+     * 获取财务监管-利息维护详情
+     *
+     * @author ZeroLiYi
+     * @date  2024/07/25 15:20
+     **/
+    BusinessFsInterestMaintain queryEntity(Integer id);
+
+    List<FsInterestSubsidySettle> finfByYear(Integer planYear);
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestmaintain/service/impl/BusinessFsInterestMaintainServiceImpl.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package com.unis.financialSupervision.modular.fsinterestmaintain.service.impl;
+
+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.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.unis.common.constant.DBConstant;
+import com.unis.financialSupervision.modular.fsinterestmaintain.entity.BusinessFsInterestMaintain;
+import com.unis.financialSupervision.modular.fsinterestmaintain.mapper.BusinessFsInterestMaintainMapper;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainAddParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainEditParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainIdParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.param.BusinessFsInterestMaintainPageParam;
+import com.unis.financialSupervision.modular.fsinterestmaintain.service.BusinessFsInterestMaintainService;
+import com.unis.financialSupervision.modular.fsinterestsubsidysettle.entity.FsInterestSubsidySettle;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.unis.common.enums.CommonSortOrderEnum;
+import com.unis.common.exception.CommonException;
+import com.unis.common.page.CommonPageRequest;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 财务监管-利息维护Service接口实现类
+ *
+ * @author ZeroLiYi
+ * @date  2024/07/25 15:20
+ **/
+@Service
+@DS(DBConstant.DS_DEPOT)
+public class BusinessFsInterestMaintainServiceImpl extends ServiceImpl<BusinessFsInterestMaintainMapper, BusinessFsInterestMaintain> implements BusinessFsInterestMaintainService {
+    @Resource
+    private BusinessFsInterestMaintainMapper businessFsInterestMaintainMapper;
+
+    @Override
+    public Page<BusinessFsInterestMaintain> page(BusinessFsInterestMaintainPageParam businessFsInterestMaintainPageParam) {
+        QueryWrapper<BusinessFsInterestMaintain> queryWrapper = new QueryWrapper<>();
+        if(ObjectUtil.isAllNotEmpty(businessFsInterestMaintainPageParam.getSortField(), businessFsInterestMaintainPageParam.getSortOrder())) {
+            CommonSortOrderEnum.validate(businessFsInterestMaintainPageParam.getSortOrder());
+            queryWrapper.orderBy(true, businessFsInterestMaintainPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
+                    StrUtil.toUnderlineCase(businessFsInterestMaintainPageParam.getSortField()));
+        } else {
+            queryWrapper.lambda().orderByAsc(BusinessFsInterestMaintain::getId);
+        }
+        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(BusinessFsInterestMaintainAddParam businessFsInterestMaintainAddParam) {
+        BusinessFsInterestMaintain businessFsInterestMaintain = BeanUtil.toBean(businessFsInterestMaintainAddParam, BusinessFsInterestMaintain.class);
+        this.save(businessFsInterestMaintain);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void edit(BusinessFsInterestMaintainEditParam businessFsInterestMaintainEditParam) {
+        BusinessFsInterestMaintain businessFsInterestMaintain = this.queryEntity(businessFsInterestMaintainEditParam.getId());
+        BeanUtil.copyProperties(businessFsInterestMaintainEditParam, businessFsInterestMaintain);
+        this.updateById(businessFsInterestMaintain);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void delete(List<BusinessFsInterestMaintainIdParam> businessFsInterestMaintainIdParamList) {
+        // 执行删除
+        this.removeByIds(CollStreamUtil.toList(businessFsInterestMaintainIdParamList, BusinessFsInterestMaintainIdParam::getId));
+    }
+
+    @Override
+    public BusinessFsInterestMaintain detail(BusinessFsInterestMaintainIdParam businessFsInterestMaintainIdParam) {
+        return this.queryEntity(businessFsInterestMaintainIdParam.getId());
+    }
+
+    @Override
+    public BusinessFsInterestMaintain queryEntity(Integer id) {
+        BusinessFsInterestMaintain businessFsInterestMaintain = this.getById(id);
+        if(ObjectUtil.isEmpty(businessFsInterestMaintain)) {
+            throw new CommonException("财务监管-利息维护不存在，id值为：{}", id);
+        }
+        return businessFsInterestMaintain;
+    }
+
+    @Override
+    public List<FsInterestSubsidySettle> finfByYear(Integer planYear) {
+        return businessFsInterestMaintainMapper.finfByYear(planYear);
+    }
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/controller/FsInterestSubsidySettleController.java

@@ -36,6 +36,7 @@ import com.unis.financialSupervision.modular.fsinterestsubsidysettle.service.FsI
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * 财务监管-省级储备粮清算管理-利息补贴清算表控制器
@@ -62,7 +63,7 @@ public class FsInterestSubsidySettleController {
     @ApiOperation("获取财务监管-省级储备粮清算管理-利息补贴清算表分页")
     @SaCheckPermission("/financialSupervision/fsinterestsubsidysettle/page")
     @GetMapping("/financialSupervision/fsinterestsubsidysettle/page")
-    public CommonResult<Page<FsInterestSubsidySettle>> page(FsInterestSubsidySettlePageParam fsInterestSubsidySettlePageParam) {
+    public CommonResult<List<FsInterestSubsidySettle>> page(FsInterestSubsidySettlePageParam fsInterestSubsidySettlePageParam) {
         return CommonResult.data(fsInterestSubsidySettleService.page(fsInterestSubsidySettlePageParam));
     }
 
@@ -75,7 +76,6 @@ public class FsInterestSubsidySettleController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加财务监管-省级储备粮清算管理-利息补贴清算表")
     @CommonLog("添加财务监管-省级储备粮清算管理-利息补贴清算表")
-    @SaCheckPermission("/financialSupervision/fsinterestsubsidysettle/add")
     @PostMapping("/financialSupervision/fsinterestsubsidysettle/add")
     public CommonResult<String> add(@RequestBody @Valid FsInterestSubsidySettleAddParam fsInterestSubsidySettleAddParam) {
         fsInterestSubsidySettleService.add(fsInterestSubsidySettleAddParam);
@@ -91,7 +91,6 @@ public class FsInterestSubsidySettleController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑财务监管-省级储备粮清算管理-利息补贴清算表")
     @CommonLog("编辑财务监管-省级储备粮清算管理-利息补贴清算表")
-    @SaCheckPermission("/financialSupervision/fsinterestsubsidysettle/edit")
     @PostMapping("/financialSupervision/fsinterestsubsidysettle/edit")
     public CommonResult<String> edit(@RequestBody @Valid FsInterestSubsidySettleEditParam fsInterestSubsidySettleEditParam) {
         fsInterestSubsidySettleService.edit(fsInterestSubsidySettleEditParam);

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/entity/FsInterestSubsidySettle.java

@@ -78,4 +78,5 @@ public class FsInterestSubsidySettle {
     /** 备注 */
     @ApiModelProperty(value = "备注", position = 11)
     private String remark;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/param/FsInterestSubsidySettlePageParam.java

@@ -48,4 +48,8 @@ public class FsInterestSubsidySettlePageParam {
     @ApiModelProperty(value = "关键词")
     private String searchKey;
 
+    /** 年 */
+    @ApiModelProperty(value = "年")
+    private Integer planYear;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/service/FsInterestSubsidySettleService.java

@@ -36,7 +36,7 @@ public interface FsInterestSubsidySettleService extends IService<FsInterestSubsi
      * @author ZeroLiYi
      * @date  2024/06/28 17:51
      */
-    Page<FsInterestSubsidySettle> page(FsInterestSubsidySettlePageParam fsInterestSubsidySettlePageParam);
+    List<FsInterestSubsidySettle> page(FsInterestSubsidySettlePageParam fsInterestSubsidySettlePageParam);
 
     /**
      * 添加财务监管-省级储备粮清算管理-利息补贴清算表

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/service/impl/FsInterestSubsidySettleServiceImpl.java

@@ -19,6 +19,9 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.unis.financialSupervision.modular.fsinterestmaintain.entity.BusinessFsInterestMaintain;
+import com.unis.financialSupervision.modular.fsinterestmaintain.service.BusinessFsInterestMaintainService;
+import com.unis.financialSupervision.modular.fsstoragesubsidysettle.entity.FsStorageSubsidySettle;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.unis.common.enums.CommonSortOrderEnum;
@@ -32,6 +35,8 @@ import com.unis.financialSupervision.modular.fsinterestsubsidysettle.param.FsInt
 import com.unis.financialSupervision.modular.fsinterestsubsidysettle.param.FsInterestSubsidySettlePageParam;
 import com.unis.financialSupervision.modular.fsinterestsubsidysettle.service.FsInterestSubsidySettleService;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -42,10 +47,16 @@ import java.util.List;
  **/
 @Service
 public class FsInterestSubsidySettleServiceImpl extends ServiceImpl<FsInterestSubsidySettleMapper, FsInterestSubsidySettle> implements FsInterestSubsidySettleService {
+    @Resource
+    private BusinessFsInterestMaintainService businessFsInterestMaintainService;
 
     @Override
-    public Page<FsInterestSubsidySettle> page(FsInterestSubsidySettlePageParam fsInterestSubsidySettlePageParam) {
+    public List<FsInterestSubsidySettle> page(FsInterestSubsidySettlePageParam fsInterestSubsidySettlePageParam) {
+        List<FsInterestSubsidySettle> fsInterestSubsidySettleList =new ArrayList<>();
         QueryWrapper<FsInterestSubsidySettle> queryWrapper = new QueryWrapper<>();
+        if(ObjectUtil.isNotEmpty(fsInterestSubsidySettlePageParam.getPlanYear())) {
+            queryWrapper.lambda().eq(FsInterestSubsidySettle::getYear, fsInterestSubsidySettlePageParam.getPlanYear());
+        }
         if(ObjectUtil.isAllNotEmpty(fsInterestSubsidySettlePageParam.getSortField(), fsInterestSubsidySettlePageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(fsInterestSubsidySettlePageParam.getSortOrder());
             queryWrapper.orderBy(true, fsInterestSubsidySettlePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
@@ -53,7 +64,13 @@ public class FsInterestSubsidySettleServiceImpl extends ServiceImpl<FsInterestSu
         } else {
             queryWrapper.lambda().orderByAsc(FsInterestSubsidySettle::getId);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        fsInterestSubsidySettleList = this.list(queryWrapper);
+        if(fsInterestSubsidySettleList.isEmpty()){
+            fsInterestSubsidySettleList=   businessFsInterestMaintainService.finfByYear(fsInterestSubsidySettlePageParam.getPlanYear());
+        }
+
+
+        return fsInterestSubsidySettleList;
     }
 
     @Transactional(rollbackFor = Exception.class)

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsstoragesubsidysettle/mapper/FsStorageSubsidySettleMapper.java

@@ -30,7 +30,7 @@ public interface FsStorageSubsidySettleMapper extends BaseMapper<FsStorageSubsid
      * 查询库区
      * @return
      */
-    List<Map<String, Object>> getOrgAndKcSum(@Param("year")int Year);
+    List<Map<String, Object>> getOrgAndKcSum(@Param("year")int Year,@Param("orgId") String orgId);
 
     /**
      * 架空期开始时间和截止时间
@@ -39,4 +39,8 @@ public interface FsStorageSubsidySettleMapper extends BaseMapper<FsStorageSubsid
      * @return
      */
     Map<String, Object> getStaetAndEnd(@Param("orgId")String orgId,@Param("year") int Year);
+
+    List<Map<String, Object>> getOrgAndYlKcSum(@Param("year")int year,@Param("orgId") String orgId);
+
+    List<Map<String, Object>> selectOrgInfo();
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsstoragesubsidysettle/mapper/mapping/FsStorageSubsidySettleMapper.xml

@@ -6,11 +6,11 @@
         SELECT DISTINCT
             UnitID,
             nf,
-            count(yf),
+            count(yf) ys,
             sum(ROUND(qmkc/10000, 2)) AS qmkc
         FROM
             depot_qh.data_kcgl_kcyjd_default
-        where nf=#{Year}
+        where pz!=7144 and nf=#{Year} and UnitID=#{orgId}
         GROUP BY
             nf,
             UnitID
@@ -18,13 +18,33 @@
     </select>
     <select id="getStaetAndEnd" resultType="java.util.Map">
         SELECT
-            rotation_start 	rotationStart,
-            rotation_end rotationEnd,
-            SUM(planned_quantity -remaining_quantity)quantity
+            a.rotation_start 	rotationStart,
+            a.rotation_end rotationEnd,
+            SUM(ROUND((a.planned_quantity - a.remaining_quantity) / 10000.0, 2)) AS quantity
+        FROM
+            province_all.biz_pss_storage_empty_period a
+        left join depot_qh.business_rp_report b on a.rp_report_id =b.id and plan_type=1
+        where a.org_id=#{orgId} and a.plan_year =#{Year} and a.rotation_status=1
+        GROUP BY a.org_id
+
+    </select>
+    <select id="getOrgAndYlKcSum" resultType="java.util.Map">
+        SELECT DISTINCT
+            UnitID,
+            nf,
+            count(yf),
+            sum(ROUND(qmkc/10000, 2)) AS qmkc
         FROM
-            province_all.biz_pss_storage_empty_period
-        where org_id=#{orgId} and plan_year =#{Year}
-        GROUP BY org_id
+            depot_qh.data_kcgl_kcyjd_default
+        where pz=7144 and nf=#{Year}
+        GROUP BY
+            nf,
+            UnitID
+
+
+    </select>
+    <select id="selectOrgInfo" resultType="java.util.Map">
+        select DISTINCT org_id AS orgId from depot_qh.org_info ORDER By org_id DESC
 
     </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsstoragesubsidysettle/service/impl/FsStorageSubsidySettleServiceImpl.java

@@ -20,6 +20,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.unis.rotationPlan.info.modular.rpWarnThreshold.mapper.RpWarnThresholdMapper;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +54,9 @@ public class FsStorageSubsidySettleServiceImpl extends ServiceImpl<FsStorageSubs
     @Resource
     private FsStorageSubsidySettleMapper fsStorageSubsidySettleMapper;
 
+    @Resource
+    private RpWarnThresholdMapper rpWarnThresholdMapper;
+
     @Override
     public Page<FsStorageSubsidySettle> page(FsStorageSubsidySettlePageParam fsStorageSubsidySettlePageParam) {
         QueryWrapper<FsStorageSubsidySettle> queryWrapper = new QueryWrapper<>();
@@ -111,77 +115,159 @@ public class FsStorageSubsidySettleServiceImpl extends ServiceImpl<FsStorageSubs
     @Override
     public void addFsStorageSubsidySettle() {
         int year = LocalDate.now().getYear();
+
+        LocalDate today = LocalDate.now();
+
+        // 获取当前月份
+        int ys = today.getMonthValue();
         //查询data_kcgl_kcyjd_default单位
-        List<Map<String,Object>> list= fsStorageSubsidySettleMapper.getOrgAndKcSum(year);
-        for (int j = 0; j < list.size(); j++) {
 
+        List<Map<String, Object>> listOrg = fsStorageSubsidySettleMapper.selectOrgInfo();
+
+        for (int i = 0; i < listOrg.size(); i++) {
+            Map<String, Object> mapOrg = listOrg.get(i);
+            String orgId = mapOrg.getOrDefault("orgId", "").toString();
 
             /**
              * 原粮
              */
-            Map<String, Object> map = list.get(j);
-            String orgId = map.getOrDefault("UnitID", "").toString();
-            // 获取 qmkc 的值，如果没有则默认为 0.0
-            BigDecimal qmkc = NumberUtil.toBigDecimal(map.getOrDefault("qmkc", "0.0").toString());
+            FsStorageSubsidySettle fsStorageSubsidySettle = new FsStorageSubsidySettle();
 
-            // 获取 ys 的值，如果没有则默认为 1（避免除以零）
-            int ys = Integer.parseInt(map.getOrDefault("ys", "1").toString());
+            BigDecimal averageRawGrainInventoryEmpty = new BigDecimal(0.0);/** 储备粮-原粮平均库存数量-平均正常轮空期内轮空数量 */
+            BigDecimal averageRawGrainInventory = new BigDecimal(0.00);    /** 储备粮-原粮平均库存数量-小计 */
+            BigDecimal averageRawGrainInventoryPhysical = new BigDecimal(0.0);/** 储备粮-原粮平均库存数量-平均月末实物库存 */
+            List<Map<String, Object>> listyy = fsStorageSubsidySettleMapper.getOrgAndKcSum(year,orgId);
+            for (int j = 0; j < listyy.size(); j++) {
+                Map<String, Object> map = listyy.get(j);
 
-            // 计算平均库存，如果 ys 不为零则进行除法运算
-            BigDecimal averageRawGrainInventoryPhysical = new BigDecimal(0.0);
-            if (ys != 0) {
-                averageRawGrainInventoryPhysical = qmkc.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
-            }
-            FsStorageSubsidySettle fsStorageSubsidySettle = new FsStorageSubsidySettle();
-            fsStorageSubsidySettle.setAverageInventory(averageRawGrainInventoryPhysical); //平均月末实物库存
-
-            //根据单位 和 日期 查询架空期
-            Map<String, Object> staetAndEnd = fsStorageSubsidySettleMapper.getStaetAndEnd(orgId, year);
-            LocalDateTime startTime = (LocalDateTime)map.getOrDefault("rotationStart", LocalDateTime.now()); //开始时间
-            LocalDateTime endTime = (LocalDateTime)map.getOrDefault("rotationEnd", LocalDateTime.now()); //截至时间
-            // 获取 quantity 的值，如果没有则默认为 0.0
-            BigDecimal quantity = NumberUtil.toBigDecimal(map.getOrDefault("quantity", "0.0").toString());
-            BigDecimal averageRawGrainInventoryEmpty =new BigDecimal(0.0);
-            BigDecimal averageRawGrainInventory =new BigDecimal(0.00);
-            if (ys != 0) {
-                averageRawGrainInventoryEmpty = qmkc.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
+                // 获取 qmkc 的值，如果没有则默认为 0.0
+                BigDecimal qmkc = NumberUtil.toBigDecimal(map.getOrDefault("qmkc", "0.0").toString());
+
+                // 获取 ys 的值，如果没有则默认为 1（避免除以零）
+                //int ys = Integer.parseInt(map.getOrDefault("ys", "1").toString());
+
+                // 计算平均库存，如果 ys 不为零则进行除法运算
+                if (ys != 0) {
+                    averageRawGrainInventoryPhysical = qmkc.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
+                }
+
+                fsStorageSubsidySettle.setAverageInventory(averageRawGrainInventoryPhysical); //平均月末实物库存
+
+                //根据单位 和 日期 查询架空期
+                Map<String, Object> staetAndEnd = fsStorageSubsidySettleMapper.getStaetAndEnd(orgId, year);
+                LocalDateTime startTime = (LocalDateTime) map.getOrDefault("rotationStart", LocalDateTime.now()); //开始时间
+                LocalDateTime endTime = (LocalDateTime) map.getOrDefault("rotationEnd", LocalDateTime.now()); //截至时间
+                // 获取 quantity 的值，如果没有则默认为 0.0
+                BigDecimal quantity = NumberUtil.toBigDecimal(map.getOrDefault("quantity", "0.0").toString());
+
+                if (ys != 0) {
+                    averageRawGrainInventoryEmpty = quantity.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
+                }
+                fsStorageSubsidySettle.setAverageRawGrainInventoryEmpty(averageRawGrainInventoryEmpty);//平均正常轮空期内轮空数量
+                averageRawGrainInventory = averageRawGrainInventoryPhysical.add(averageRawGrainInventoryEmpty);
+                averageRawGrainInventory = averageRawGrainInventory.multiply(new BigDecimal("0.2"));
+                fsStorageSubsidySettle.setAverageRawGrainInventory(averageRawGrainInventory);//(1)
             }
-            fsStorageSubsidySettle.setAverageRawGrainInventoryEmpty(averageRawGrainInventoryEmpty);//平均正常轮空期内轮空数量
-            averageRawGrainInventory=averageRawGrainInventoryPhysical.add(averageRawGrainInventoryEmpty);
-            averageRawGrainInventory=averageRawGrainInventory.multiply(new BigDecimal("0.2"));
-            fsStorageSubsidySettle.setAverageRawGrainInventory(averageRawGrainInventory);//(1)
+
+
 
             /**
              * 成品粮
              *
              */
-            BigDecimal averageProcessedGrainInventory= new BigDecimal(0.0);//(2)  /** 储备粮-成品粮平均库存数量-小计 */
-            BigDecimal averageProcessedGrainInventoryPhysical= new BigDecimal(0.0); /** 储备粮-成品粮平均库存数量-平均月末实物库存 */
-            BigDecimal averageProcessedGrainInventoryEmpty= new BigDecimal(0.0); /** 储备粮-成品粮平均库存数量-平均正常轮空期内轮空数量 */
+            BigDecimal averageProcessedGrainInventoryEmpty = new BigDecimal(0.0); /** 储备粮-成品粮平均库存数量-平均正常轮空期内轮空数量 */
+            //根据年度和orgId 查询 -成品粮购销计划
+            List<Map<String, Object>> list1 = rpWarnThresholdMapper.getGopsPlans(year, orgId);
+            BigDecimal sjlcsl = new BigDecimal(0.0);
+            BigDecimal sjsysl = new BigDecimal(0.0);
+            for (int j1 = 0; j1 < list1.size(); j1++) {
+                Map<String, Object> map1 = list1.get(j1);
+                LocalDateTime firstTime = (LocalDateTime) map1.getOrDefault("startTime", LocalDateTime.now()); //第一车出库时间
+                LocalDateTime firstDayOfNextMonth = firstTime.plusMonths(1).withDayOfMonth(1);
+                LocalDateTime futureDate = firstDayOfNextMonth.plusMonths(4);
+                LocalDateTime endTime = (LocalDateTime) map1.get("endTime");
+                if (endTime != null && endTime.isBefore(futureDate)) {
+                    BigDecimal wcsl = (BigDecimal) map1.getOrDefault("wcsl", BigDecimal.ZERO);
+                    sjlcsl = sjlcsl.add(wcsl);
+                    BigDecimal sysl = (BigDecimal) map1.getOrDefault("sysl", BigDecimal.ZERO);
+                    sjsysl = sjsysl.add(sysl);
+                }
+
+            }
+            if (ys != 0) {
+                averageProcessedGrainInventoryEmpty = sjlcsl.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
+            }
+            fsStorageSubsidySettle.setAverageProcessedGrainInventoryEmpty(averageProcessedGrainInventoryEmpty);/** 储备粮-成品粮平均库存数量-平均正常轮空期内轮空数量 */
+
+            BigDecimal averageProcessedGrainInventoryPhysical = new BigDecimal(0.0); /** 储备粮-成品粮平均库存数量-平均月末实物库存 */
+            if (ys != 0) {
+                averageProcessedGrainInventoryPhysical = sjsysl.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
+            }
+            fsStorageSubsidySettle.setAverageProcessedGrainInventoryPhysical(averageProcessedGrainInventoryPhysical);/** 储备粮-成品粮平均库存数量-平均月末实物库存 */
 
+            BigDecimal averageProcessedGrainInventory = new BigDecimal(0.0);//(2)  /** 储备粮-成品粮平均库存数量-小计 */
 
 
             BigDecimal averageInventory = new BigDecimal(0.0);/** 储备粮平均库存数量 */
-            averageInventory=averageRawGrainInventory.add(averageProcessedGrainInventory);
+            averageInventory = averageRawGrainInventory.add(averageProcessedGrainInventoryEmpty);
             fsStorageSubsidySettle.setAverageOilInventory(averageInventory);//(1)+(2)
+
             /**
              * 保管费用补贴
              */
-           BigDecimal storageSubsidyStandardRawGrain = new BigDecimal(0.0);//(1) /** 储备粮-原粮保管费用补贴（标准：0.12元/公斤）应拨数 */
-            storageSubsidyStandardRawGrain=averageRawGrainInventory.multiply(new BigDecimal("0.12"));//单位：万元
+            BigDecimal storageSubsidyStandardRawGrain = new BigDecimal(0.0);//(1) /** 储备粮-原粮保管费用补贴（标准：0.12元/公斤）应拨数 */
+            storageSubsidyStandardRawGrain = averageRawGrainInventory.multiply(new BigDecimal("0.12"));//单位：万元
             fsStorageSubsidySettle.setStorageSubsidyRawGrain(storageSubsidyStandardRawGrain);
 
-           BigDecimal storageSubsidyProcessedGrain = new BigDecimal(0.0);/** 储备粮-成品粮保管费用补贴（标准：0.20元/公斤）应拨数 */
+            BigDecimal storageSubsidyProcessedGrain = new BigDecimal(0.0);/** 储备粮-成品粮保管费用补贴（标准：0.20元/公斤）应拨数 */
             storageSubsidyProcessedGrain = averageProcessedGrainInventory.multiply(new BigDecimal("0.20"));//单位：万元
             fsStorageSubsidySettle.setStorageSubsidyProcessedGrain(storageSubsidyProcessedGrain);
 
-           BigDecimal storageSubsidyRawGrain = new BigDecimal(0.0);//(3)+(4) /** 储备粮-原粮保管费用补贴应拨数 */
-            storageSubsidyRawGrain=storageSubsidyStandardRawGrain.add(storageSubsidyProcessedGrain);
+            BigDecimal storageSubsidyRawGrain = new BigDecimal(0.0);//(3)+(4) /** 储备粮-原粮保管费用补贴应拨数 */
+
+            storageSubsidyRawGrain = storageSubsidyStandardRawGrain.add(storageSubsidyProcessedGrain);
             fsStorageSubsidySettle.setStorageSubsidyRawGrain(storageSubsidyRawGrain);
+            /**
+             * 储备油
+             */
+            BigDecimal averageOilInventoryPhysical = new BigDecimal(0.0);/** 储备油-储油平均库存数量-平均月末实物库存 */
+            BigDecimal averageOilInventoryEmpty = new BigDecimal(0.0);/** 储备油-储油平均库存数量-平均正常轮空期内轮空数量 */
+            BigDecimal averageOilInventory = new BigDecimal(0.0);/** 储备油-储油平均库存数量-小计 */
+            List<Map<String, Object>> list2 = fsStorageSubsidySettleMapper.getOrgAndYlKcSum(year, orgId);
+            for (int j2 = 0; j2< list2.size(); j2++) {
+                Map<String, Object> mapy = listyy.get(j2);
+                // 获取 qmkc 的值，如果没有则默认为 0.0
+                BigDecimal qmkc = NumberUtil.toBigDecimal(mapy.getOrDefault("qmkc", "0.0").toString());
 
+                // 获取 ys 的值，如果没有则默认为 1（避免除以零）
+                //int ys = Integer.parseInt(map.getOrDefault("ys", "1").toString());
 
+                // 计算平均库存，如果 ys 不为零则进行除法运算
+                if (ys != 0) {
+                    averageOilInventoryPhysical = qmkc.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
+                }
 
+                fsStorageSubsidySettle.setAverageOilInventoryPhysical(averageOilInventoryPhysical); //平均月末实物库存
 
+                //根据单位 和 日期 查询架空期
+                Map<String, Object> staetAndEnd = fsStorageSubsidySettleMapper.getStaetAndEnd(orgId, year);
+                LocalDateTime startTime = (LocalDateTime) mapy.getOrDefault("rotationStart", LocalDateTime.now()); //开始时间
+                LocalDateTime endTime = (LocalDateTime) mapy.getOrDefault("rotationEnd", LocalDateTime.now()); //截至时间
+                // 获取 quantity 的值，如果没有则默认为 0.0
+                BigDecimal quantity = NumberUtil.toBigDecimal(mapy.getOrDefault("quantity", "0.0").toString());
+
+                if (ys != 0) {
+                    averageOilInventoryEmpty = quantity.divide(BigDecimal.valueOf(ys), 2, BigDecimal.ROUND_HALF_UP);
+                }
+                fsStorageSubsidySettle.setAverageOilInventoryEmpty(averageOilInventoryEmpty);//平均正常轮空期内轮空数量
+                averageOilInventory = averageOilInventoryPhysical.add(averageOilInventoryEmpty);
+
+                BigDecimal storageSubsidyOil = new BigDecimal(0.0);/** 储备油-油料保管费用补贴（标准：0.40元/公斤）应拨数 */
+                storageSubsidyOil = averageOilInventory.multiply(new BigDecimal("0.2"));
+                fsStorageSubsidySettle.setStorageSubsidyOil(storageSubsidyOil);//(5)
+
+            }
+            this.save(fsStorageSubsidySettle);
         }
 
     }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/rpWarnThreshold/mapper/RpWarnThresholdMapper.java

@@ -101,4 +101,8 @@ public interface RpWarnThresholdMapper extends BaseMapper<RpWarnThreshold> {
     Map<String, BigDecimal> selectLHJH(@Param("unitID")String unitID,@Param("rpReportId") String rpReportId);
 
     Map<String, Object> getMaxDate(@Param("rpReportId")String rpReportId,@Param("sjhwh") String sjhwh);
+
+    List<Map<String, Object>> getGopsPlans(@Param("year")int year,@Param("orgId") String orgId);
+
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/rpWarnThreshold/mapper/mapping/RpWarnThresholdMapper.xml

@@ -196,5 +196,20 @@
         GROUP BY b.UnitID
 
     </select>
+    <select id="getGopsPlans" resultType="java.util.Map">
+        SELECT DISTINCT
+            id,
+            org_id as "orgId",
+            plan_start_time AS "startTime",
+            plan_end_time AS "endTime",
+            plan_quantity jhsl,
+            completion_quantity wcsl,
+            remaining_amount sysl
+        FROM
+            depot_qh.business_pg_gops_plan
+
+        WHERE
+            org_id=#{orgId} and YEAR(plan_year)=#{year} and plan_type=1
+    </select>
 
 </mapper>