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

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/controller/BusinessRpReportController.java

@@ -0,0 +1,165 @@
+/*
+ * 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.rotationPlan.info.modular.businessrpreport.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.rotationPlan.info.modular.businessrpreport.util.Grain;
+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 com.unis.common.pojo.CommonValidList;
+import com.unis.rotationPlan.info.modular.businessrpreport.entity.BusinessRpReport;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportAddParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportEditParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportIdParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportPageParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.service.BusinessRpReportService;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 轮换计划-上报控制器
+ *
+ * @author ZeroLiYi
+ * @date  2024/05/14 18:05
+ */
+@Api(tags = "轮换计划-上报控制器")
+@ApiSupport(author = "UNIS_TEAM", order = 1)
+@RestController
+@Validated
+public class BusinessRpReportController {
+
+    @Resource
+    private BusinessRpReportService businessRpReportService;
+
+    /**
+     * 获取轮换计划-上报分页
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("获取轮换计划-上报分页")
+    @GetMapping("/rotationPlan.info/businessrpreport/page")
+    public CommonResult<IPage<Map<String,Object>>> page(BusinessRpReportPageParam businessRpReportPageParam) {
+        return CommonResult.data(businessRpReportService.page(businessRpReportPageParam));
+    }
+
+    /**
+     * 添加轮换计划-上报
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    @ApiOperationSupport(order = 2)
+    @ApiOperation("添加轮换计划-上报")
+    @CommonLog("添加轮换计划-上报")
+    @SaCheckPermission("/rotationPlan.info/businessrpreport/add")
+    @PostMapping("/rotationPlan.info/businessrpreport/add")
+    public CommonResult<String> add(@RequestBody @Valid BusinessRpReportAddParam businessRpReportAddParam) {
+        businessRpReportService.add(businessRpReportAddParam);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 编辑轮换计划-上报
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("编辑轮换计划-上报")
+    @CommonLog("编辑轮换计划-上报")
+    @SaCheckPermission("/rotationPlan.info/businessrpreport/edit")
+    @PostMapping("/rotationPlan.info/businessrpreport/edit")
+    public CommonResult<String> edit(@RequestBody @Valid BusinessRpReportEditParam businessRpReportEditParam) {
+        businessRpReportService.edit(businessRpReportEditParam);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 删除轮换计划-上报
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    @ApiOperationSupport(order = 4)
+    @ApiOperation("删除轮换计划-上报")
+    @CommonLog("删除轮换计划-上报")
+    @SaCheckPermission("/rotationPlan.info/businessrpreport/delete")
+    @PostMapping("/rotationPlan.info/businessrpreport/delete")
+    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
+                                                   CommonValidList<BusinessRpReportIdParam> businessRpReportIdParamList) {
+        businessRpReportService.delete(businessRpReportIdParamList);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 获取轮换计划-上报详情
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("获取轮换计划-上报详情")
+    @SaCheckPermission("/rotationPlan.info/businessrpreport/detail")
+    @GetMapping("/rotationPlan.info/businessrpreport/detail")
+    public CommonResult<List<Map<String,Object>>> detail(@Valid BusinessRpReportIdParam businessRpReportIdParam) {
+        return CommonResult.data(businessRpReportService.detail(businessRpReportIdParam));
+    }
+
+    /**
+     * 轮换计划制定(汇总)分页
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+//    @ApiOperationSupport(order = 1)
+//    @ApiOperation("轮换计划制定(汇总)分页")
+//    @GetMapping("/rotationPlan.info/businessrpreport/page")
+//    public CommonResult<IPage<Map<String,Object>>> findSumpage(BusinessRpReportPageParam businessRpReportPageParam) {
+//        return CommonResult.data(businessRpReportService.findSumpage(businessRpReportPageParam));
+//    }
+
+
+    /**
+     * 生成制定轮换计划
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("生成制定轮换计划")
+    @GetMapping("/rotationPlan.info/businessrpreport/createreport")
+    public CommonResult<Map<String,Object>> createreport(@Valid BusinessRpReportIdParam businessRpReportIdParam) {
+
+        Map<String,Object> map =businessRpReportService.createReport(businessRpReportIdParam);
+        return CommonResult.data(map);
+    }
+
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/entity/BusinessRpReport.java

@@ -0,0 +1,97 @@
+/*
+ * 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.rotationPlan.info.modular.businessrpreport.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/05/14 18:05
+ **/
+@Getter
+@Setter
+@TableName("business_rp_report")
+public class BusinessRpReport {
+
+    /** 主键ID */
+    @TableId
+    @ApiModelProperty(value = "主键ID", position = 1)
+    private Integer id;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间", position = 2)
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /** 创建用户 */
+    @ApiModelProperty(value = "创建用户", position = 3)
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    /** 更新时间 */
+    @ApiModelProperty(value = "更新时间", position = 4)
+    @TableField(fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+    /** 更新用户 */
+    @ApiModelProperty(value = "更新用户", position = 5)
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateUser;
+
+    /** 企业id；province_all.biz_unit_info的id； */
+    @ApiModelProperty(value = "企业id；province_all.biz_unit_info的id；", position = 6)
+    private String unitInfoId;
+
+    /** 计划名称 */
+    @ApiModelProperty(value = "计划名称", position = 7)
+    private String planName;
+
+    /** 轮换年度 */
+    @ApiModelProperty(value = "轮换年度", position = 8)
+    private Date rotationYear;
+
+    /** 计划类型 1: 粮食轮换计划; 2: 油料轮换计划; */
+    @ApiModelProperty(value = "计划类型 1: 粮食轮换计划; 2: 油料轮换计划;", position = 9)
+    private Integer planType;
+
+    /** 计划年度 */
+    @ApiModelProperty(value = "计划年度", position = 10)
+    private Date planYear;
+
+    /** 申请人 */
+    @ApiModelProperty(value = "申请人", position = 11)
+    private String applicant;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 12)
+    private Date createDate;
+
+    /** 状态 0：保存；1：提交； */
+    @ApiModelProperty(value = "状态 0：保存；1：提交；", position = 13)
+    private Integer status;
+
+    /** 上报时间 */
+    @ApiModelProperty(value = "上报时间", position = 14)
+    private Date reportTime;
+
+    /** 轮换类型 1:静态轮换；2：动态轮换； */
+    @ApiModelProperty(value = "轮换类型 1:静态轮换；2：动态轮换；", position = 15)
+    private Integer type;
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/entity/vo/BusinessRpReportVO.java

@@ -0,0 +1,29 @@
+package com.unis.rotationPlan.info.modular.businessrpreport.entity.vo;
+
+import com.unis.rotationPlan.info.modular.businessrpreport.entity.BusinessRpReport;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class BusinessRpReportVO{
+
+    private Integer orgId;
+
+    private String dwmc;//企业名称名称
+
+    private String orgName; //单位名称
+
+    private String grainVarietyName;//粮食品种
+
+    private String storehouseName;//仓房名称
+
+    private String warehouseName; //货位名称
+
+    private Double outboundQuantity;//轮出数量
+
+    private Double inboundQuantity;//轮入数量
+
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/enums/BusinessRpReportEnum.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.rotationPlan.info.modular.businessrpreport.enums;
+
+import lombok.Getter;
+
+/**
+ * 轮换计划-上报枚举
+ *
+ * @author ZeroLiYi
+ * @date  2024/05/14 18:05
+ **/
+@Getter
+public enum BusinessRpReportEnum {
+
+    /** 测试 */
+    TEST("TEST");
+
+    private final String value;
+
+    BusinessRpReportEnum(String value) {
+        this.value = value;
+    }
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/mapper/BusinessRpReportMapper.java

@@ -0,0 +1,47 @@
+/*
+ * 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.rotationPlan.info.modular.businessrpreport.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.unis.rotationPlan.info.modular.businessrpreport.entity.BusinessRpReport;
+import com.unis.rotationPlan.info.modular.businessrpreport.entity.vo.BusinessRpReportVO;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportIdParam;
+import com.unis.rotationPlan.info.modular.rpBiweeklyReport.entity.RpBiweeklyReport;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 轮换计划-上报Mapper接口
+ *
+ * @author ZeroLiYi
+ * @date  2024/05/14 18:05
+ **/
+public interface BusinessRpReportMapper extends BaseMapper<BusinessRpReport> {
+
+    IPage<Map<String,Object>> selectMyMapsPage(Page<BusinessRpReport> p, @Param(Constants.WRAPPER) QueryWrapper<BusinessRpReport>queryWrapper);
+
+    /**
+     * 获取轮换计划上报详情
+     * @param id
+     * @return
+     */
+    List<Map<String,Object>> getDetail(@Param("id") Integer id);
+
+    List<BusinessRpReportVO> createReport(BusinessRpReportIdParam businessRpReportIdParam);
+}

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

@@ -0,0 +1,107 @@
+<?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.rotationPlan.info.modular.businessrpreport.mapper.BusinessRpReportMapper">
+
+    <select id="selectMyMapsPage" resultType="java.util.Map">
+        SELECT
+        b.dwmc AS dwmc,
+        SUM(bro.plan_quantity) AS plan_quantity,
+        SUM(bri.quantity) AS quantity,
+        brr.rotation_year AS rotationYear,
+        brr.report_time AS reportTime
+        FROM
+        depot_qh.business_rp_report brr
+        LEFT JOIN depot_qh.business_rp_outbound bro
+        ON bro.rp_report_id = brr.id
+        LEFT JOIN depot_qh.business_rp_inbound bri
+        ON bri.rp_report_id = brr.id
+        LEFT JOIN depot_qh.org_info oi
+        ON bro.org_id = oi.org_id -- 假设bro.org_id和bri.org_id应相同，否则需要额外处理
+        LEFT JOIN province_all.biz_unit_info b
+        ON brr.unit_info_id = b.id
+        <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
+            where ${ew.sqlSegment}
+        </if>
+        GROUP BY
+        oi.org_name,
+        brr.rotation_year,
+        brr.report_time
+    </select>
+
+    <select id="getDetail" resultType="java.util.Map">
+        SELECT
+            brr.unit_info_id,
+            brr.plan_name,
+            brr.rotation_year,  -- 轮换年度
+            brr.plan_type,  -- 计划类型 1: 粮食轮换计划; 2: 油料轮换计划;
+            brr.plan_year,  -- 计划年度
+            brr.type,  -- 轮换类型
+            brr.applicant,  --  申请人
+            brr.create_date,  -- 创建日期
+            bro.*,
+            oi.org_name kqmc,
+            bri.*,
+            bro.sealing_quantity,
+            be1.enumName grainVarietyName,
+            be2.enumName grainNatureName,
+            be3.enumName grainGradeName,
+            bs.storehouse_name storehouseName,
+            bw.warehouse_name warehouseName
+
+        FROM
+            depot_qh.business_rp_report brr
+                LEFT JOIN depot_qh.business_rp_outbound bro ON bro.rp_report_id = brr.id
+                left JOIN depot_qh.org_info oi on bro.org_id=oi.org_id
+                LEFT JOIN depot_qh.basic_storehouse bs on bro.basic_storehouse_id=bs.storehouse_id
+                LEFT JOIN depot_qh.basic_warehouse bw on  bro.warehouse_id =bw.warehouse_id
+                LEFT JOIN depot_qh.basic_enum be1 on bro.grain_variety_id =be1.enumId
+                LEFT JOIN depot_qh.basic_enum be2 on bro.grain_nature_id =be2.enumId
+                LEFT JOIN depot_qh.basic_enum be3 on bro.grain_grade_id =be3.enumId
+                LEFT JOIN depot_qh.business_rp_inbound bri on bri.rp_report_id= brr.id
+        where brr.id =#{id}
+    </select>
+
+
+    <select id="createReport" resultType="com.unis.rotationPlan.info.modular.businessrpreport.entity.vo.BusinessRpReportVO">
+        SELECT
+            org_id orgId,
+            dwmc,
+            org_name orgName,
+            plan_year,
+            -- grain_variety_id ,
+            enumName grainVarietyName,
+            storehouse_name storehouseName,
+            warehouse_name warehouseName,
+            MAX(CASE WHEN grain_variety_id  THEN outbound_quantity ELSE NULL END) AS outboundQuantity,
+            MAX(CASE WHEN grain_variety_id  THEN inbound_quantity ELSE NULL END) AS inboundQuantity
+
+        FROM (
+                 SELECT
+                     bo.org_id,
+                     A.dwmc,
+                     A.org_name,
+                     bo.grain_variety_id,
+                     bw.warehouse_name,
+                     bs.storehouse_name,
+                     be1.enumName,
+                     bbo.plan_year,
+                     SUM(bo.plan_quantity) AS outbound_quantity,
+                     SUM(bi.quantity) AS inbound_quantity
+                 FROM
+                     depot_qh.business_rp_outbound bo
+                         LEFT JOIN depot_qh.business_rp_inbound bi ON bo.org_id = bi.org_id AND bo.grain_variety_id = bi.grain_variety_id
+                         left join  business_rp_report bbo on bbo.id=bo.rp_report_id
+                         LEFT JOIN depot_qh.basic_enum be1 on bo.grain_variety_id =be1.enumId
+                         left join (select o.org_id,bui.dwmc,o.org_name from province_all.biz_unit_info bui LEFT JOIN depot_qh.org_info o on  o.unit_info_id =bui.id)A
+                                   on bo.org_id=A.org_id
+                         LEFT JOIN depot_qh.basic_storehouse bs on bo.basic_storehouse_id=bs.storehouse_id
+                         LEFT JOIN depot_qh.basic_warehouse bw on  bo.warehouse_id =bw.warehouse_id
+                        where bbo.plan_year=#{}
+                     -- 替换为具体的org_id或省略以查询所有
+                 GROUP BY
+                     bo.org_id,
+                     bo.grain_variety_id,
+                     bbo.plan_year
+
+    </select>
+</mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/param/BusinessRpReportAddParam.java

@@ -0,0 +1,74 @@
+/*
+ * 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.rotationPlan.info.modular.businessrpreport.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/05/14 18:05
+ **/
+@Getter
+@Setter
+public class BusinessRpReportAddParam {
+
+    /** 企业id；province_all.biz_unit_info的id； */
+    @ApiModelProperty(value = "企业id；province_all.biz_unit_info的id；", position = 6)
+    private String unitInfoId;
+
+    /** 计划名称 */
+    @ApiModelProperty(value = "计划名称", position = 7)
+    private String planName;
+
+    /** 轮换年度 */
+    @ApiModelProperty(value = "轮换年度", position = 8)
+    private Date rotationYear;
+
+    /** 计划类型 1: 粮食轮换计划; 2: 油料轮换计划; */
+    @ApiModelProperty(value = "计划类型 1: 粮食轮换计划; 2: 油料轮换计划;", position = 9)
+    private Integer planType;
+
+    /** 计划年度 */
+    @ApiModelProperty(value = "计划年度", position = 10)
+    private Date planYear;
+
+    /** 申请人 */
+    @ApiModelProperty(value = "申请人", position = 11)
+    private String applicant;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 12)
+    private Date createDate;
+
+    /** 状态 0：保存；1：提交； */
+    @ApiModelProperty(value = "状态 0：保存；1：提交；", position = 13)
+    private Integer status;
+
+    /** 上报时间 */
+    @ApiModelProperty(value = "上报时间", position = 14)
+    private Date reportTime;
+
+    /** 轮换类型 1:静态轮换；2：动态轮换； */
+    @ApiModelProperty(value = "轮换类型 1:静态轮换；2：动态轮换；", position = 15)
+    private Integer type;
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/param/BusinessRpReportEditParam.java

@@ -0,0 +1,79 @@
+/*
+ * 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.rotationPlan.info.modular.businessrpreport.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/05/14 18:05
+ **/
+@Getter
+@Setter
+public class BusinessRpReportEditParam {
+
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 企业id；province_all.biz_unit_info的id； */
+    @ApiModelProperty(value = "企业id；province_all.biz_unit_info的id；", position = 6)
+    private String unitInfoId;
+
+    /** 计划名称 */
+    @ApiModelProperty(value = "计划名称", position = 7)
+    private String planName;
+
+    /** 轮换年度 */
+    @ApiModelProperty(value = "轮换年度", position = 8)
+    private Date rotationYear;
+
+    /** 计划类型 1: 粮食轮换计划; 2: 油料轮换计划; */
+    @ApiModelProperty(value = "计划类型 1: 粮食轮换计划; 2: 油料轮换计划;", position = 9)
+    private Integer planType;
+
+    /** 计划年度 */
+    @ApiModelProperty(value = "计划年度", position = 10)
+    private Date planYear;
+
+    /** 申请人 */
+    @ApiModelProperty(value = "申请人", position = 11)
+    private String applicant;
+
+    /** 创建日期 */
+    @ApiModelProperty(value = "创建日期", position = 12)
+    private Date createDate;
+
+    /** 状态 0：保存；1：提交； */
+    @ApiModelProperty(value = "状态 0：保存；1：提交；", position = 13)
+    private Integer status;
+
+    /** 上报时间 */
+    @ApiModelProperty(value = "上报时间", position = 14)
+    private Date reportTime;
+
+    /** 轮换类型 1:静态轮换；2：动态轮换； */
+    @ApiModelProperty(value = "轮换类型 1:静态轮换；2：动态轮换；", position = 15)
+    private Integer type;
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/param/BusinessRpReportIdParam.java

@@ -0,0 +1,38 @@
+/*
+ * 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.rotationPlan.info.modular.businessrpreport.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * 轮换计划-上报Id参数
+ *
+ * @author ZeroLiYi
+ * @date  2024/05/14 18:05
+ **/
+@Getter
+@Setter
+public class BusinessRpReportIdParam {
+
+    /** 主键ID */
+    @ApiModelProperty(value = "主键ID", required = true)
+    private Integer id;
+
+    @ApiModelProperty(value = "计划年度", position = 10)
+    private Date planYear;
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/param/BusinessRpReportPageParam.java

@@ -0,0 +1,60 @@
+/*
+ * 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.rotationPlan.info.modular.businessrpreport.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 轮换计划-上报查询参数
+ *
+ * @author ZeroLiYi
+ * @date  2024/05/14 18:05
+ **/
+@Getter
+@Setter
+public class BusinessRpReportPageParam {
+
+    /** 当前页 */
+    @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;
+
+    /** 企业名称 */
+    @ApiModelProperty(value = "企业名称")
+    private String unitName;
+
+
+    @ApiModelProperty(value = "轮换年度")
+    private Date rotationYear;
+
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/service/BusinessRpReportService.java

@@ -0,0 +1,85 @@
+/*
+ * 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.rotationPlan.info.modular.businessrpreport.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.unis.rotationPlan.info.modular.businessrpreport.entity.BusinessRpReport;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportAddParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportEditParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportIdParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportPageParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.util.Grain;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 轮换计划-上报Service接口
+ *
+ * @author ZeroLiYi
+ * @date  2024/05/14 18:05
+ **/
+public interface BusinessRpReportService extends IService<BusinessRpReport> {
+
+    /**
+     * 获取轮换计划-上报分页
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    IPage<Map<String, Object>> page(BusinessRpReportPageParam businessRpReportPageParam);
+
+    /**
+     * 添加轮换计划-上报
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    void add(BusinessRpReportAddParam businessRpReportAddParam);
+
+    /**
+     * 编辑轮换计划-上报
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    void edit(BusinessRpReportEditParam businessRpReportEditParam);
+
+    /**
+     * 删除轮换计划-上报
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    void delete(List<BusinessRpReportIdParam> businessRpReportIdParamList);
+
+    /**
+     * 获取轮换计划-上报详情
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     */
+    List<Map<String,Object>> detail(BusinessRpReportIdParam businessRpReportIdParam);
+
+    /**
+     * 获取轮换计划-上报详情
+     *
+     * @author ZeroLiYi
+     * @date  2024/05/14 18:05
+     **/
+    BusinessRpReport queryEntity(Integer id);
+
+    Map<String,Object> createReport(BusinessRpReportIdParam businessRpReportIdParam);
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/service/impl/BusinessRpReportServiceImpl.java

@@ -0,0 +1,185 @@
+/*
+ * 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.rotationPlan.info.modular.businessrpreport.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.unis.rotationPlan.info.modular.businessrpreport.entity.vo.BusinessRpReportVO;
+import com.unis.rotationPlan.info.modular.businessrpreport.util.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.unis.common.exception.CommonException;
+import com.unis.rotationPlan.info.modular.businessrpreport.entity.BusinessRpReport;
+import com.unis.rotationPlan.info.modular.businessrpreport.mapper.BusinessRpReportMapper;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportAddParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportEditParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportIdParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.param.BusinessRpReportPageParam;
+import com.unis.rotationPlan.info.modular.businessrpreport.service.BusinessRpReportService;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 轮换计划-上报Service接口实现类
+ *
+ * @author ZeroLiYi
+ * @date  2024/05/14 18:05
+ **/
+@Service
+public class BusinessRpReportServiceImpl extends ServiceImpl<BusinessRpReportMapper, BusinessRpReport> implements BusinessRpReportService {
+
+    @Resource
+    private BusinessRpReportMapper businessRpReportMapper;
+
+    @Override
+    public IPage<Map<String, Object>> page(BusinessRpReportPageParam businessRpReportPageParam) {
+        //条形查询器
+        QueryWrapper<BusinessRpReport> queryWrapper = new QueryWrapper<>();
+        //分页相关
+        if(StringUtils.isNotBlank(businessRpReportPageParam.getUnitName())){
+            queryWrapper.like("b.dwmc",businessRpReportPageParam.getUnitName());
+        }
+        if(businessRpReportPageParam.getRotationYear()!=null){
+            queryWrapper.like(" brr.rotation_year",businessRpReportPageParam.getRotationYear());
+        }
+
+
+        Page<BusinessRpReport> p =new Page<>(businessRpReportPageParam.getCurrent(),businessRpReportPageParam.getSize());
+        IPage<Map<String,Object>> page = businessRpReportMapper.selectMyMapsPage(p,queryWrapper);
+        return page;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(BusinessRpReportAddParam businessRpReportAddParam) {
+        BusinessRpReport businessRpReport = BeanUtil.toBean(businessRpReportAddParam, BusinessRpReport.class);
+        this.save(businessRpReport);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void edit(BusinessRpReportEditParam businessRpReportEditParam) {
+        BusinessRpReport businessRpReport = this.queryEntity(businessRpReportEditParam.getId());
+        BeanUtil.copyProperties(businessRpReportEditParam, businessRpReport);
+        this.updateById(businessRpReport);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void delete(List<BusinessRpReportIdParam> businessRpReportIdParamList) {
+        // 执行删除
+        this.removeByIds(CollStreamUtil.toList(businessRpReportIdParamList, BusinessRpReportIdParam::getId));
+    }
+
+    @Override
+    public List<Map<String,Object>> detail(BusinessRpReportIdParam businessRpReportIdParam) {
+
+        List<Map<String,Object>> details = businessRpReportMapper.getDetail(businessRpReportIdParam.getId());
+        if(ObjectUtil.isEmpty(details)) {
+            throw new CommonException("轮换计划-轮换半月报表不存在，id值为：{}", businessRpReportIdParam.getId());
+        }
+        return details;
+    }
+
+    @Override
+    public BusinessRpReport queryEntity(Integer id) {
+        BusinessRpReport businessRpReport = this.getById(id);
+        if(ObjectUtil.isEmpty(businessRpReport)) {
+            throw new CommonException("轮换计划-上报不存在，id值为：{}", id);
+        }
+        return businessRpReport;
+    }
+
+    @Override
+    public Map<String,Object> createReport(BusinessRpReportIdParam businessRpReportIdParam) {
+           List<BusinessRpReportVO> businessRpReports = businessRpReportMapper.createReport(businessRpReportIdParam);
+        List<TableColumns> list =new ArrayList<>();
+        TableColumns tb =new TableColumns();
+        Map<String,Object> tableColumnsMap = new HashMap<>();
+        UnitInfo unitInfo =new UnitInfo();
+        OrgInfo orgInfo=new OrgInfo();
+        Map<String, Grain> grainMap = new HashMap<>();
+        int index = 1; // Initialize index for dynamic indexing if needed
+
+        // Process the list to identify unique grain types and build grain objects with columns
+        for (BusinessRpReportVO report : businessRpReports) {
+
+            String grainType = safeGetGrainType(report.getGrainVarietyName()); // Safely get the grain type
+
+            if (grainType == null) {
+                continue; // Skip if grain type cannot be determined
+            }
+            if(report.getDwmc()!=null){
+                unitInfo.setTitle("单位名称");
+                unitInfo.setAlign("center");
+                unitInfo.setDataIndex("dwmc");
+            }
+            if(report.getOrgId()!=null){
+                orgInfo.setTitle("存储库点");
+                orgInfo.setAlign("center");
+                orgInfo.setDataIndex("orgName");
+            }
+
+
+            Grain grain = grainMap.computeIfAbsent(grainType, k -> {
+                Grain newGrain = new Grain();
+                newGrain.setAlign("center");
+                newGrain.setName("grainVarietyName");
+
+                newGrain.setColumns(new ArrayList<>());
+                return newGrain;
+            });
+
+            // Add columns only if there's corresponding quantity
+            if (report.getOutboundQuantity() != null) {
+                TableColumn outboundColumn = new TableColumn();
+                outboundColumn.setTitle("轮出数量");
+                outboundColumn.setAlign("center");
+                // Use dynamic indexing if required
+                outboundColumn.setDataIndex("outboundQuantity");
+                grain.getColumns().add(outboundColumn);
+            }
+            if (report.getInboundQuantity() != null) {
+                TableColumn inboundColumn = new TableColumn();
+                inboundColumn.setTitle("轮入数量");
+                inboundColumn.setAlign("center");
+                inboundColumn.setDataIndex("inboundQuantity");
+                grain.getColumns().add(inboundColumn);
+            }
+            tableColumnsMap.put("unitInfo",unitInfo);
+            tableColumnsMap.put("orgInfo",orgInfo);
+            tableColumnsMap.put("grainMap",grainMap);
+            tableColumnsMap.put("businessRpReports",businessRpReports);
+
+        }
+
+        return tableColumnsMap;
+    }
+
+    private static String safeGetGrainType(String varietyName) {
+        return varietyName != null ? varietyName.split("及")[0] : null;
+    }
+
+    // Simulated method to fetch reports, replace with your actual method
+    private static List<BusinessRpReportVO> fetchReportsFromDatabase() {
+        return Collections.emptyList(); // Return actual data here
+    }
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/util/Grain.java

@@ -0,0 +1,15 @@
+package com.unis.rotationPlan.info.modular.businessrpreport.util;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Setter
+@Getter
+public class Grain {
+    String name;
+    private String align;
+    List<TableColumn> columns; // Contains '轮出数量' and '轮入数量'
+    public Grain() {}
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/util/OrgInfo.java

@@ -0,0 +1,13 @@
+package com.unis.rotationPlan.info.modular.businessrpreport.util;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class OrgInfo {
+
+    private String title;
+    private String align;
+    private String dataIndex;
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/util/TableColumn.java

@@ -0,0 +1,14 @@
+package com.unis.rotationPlan.info.modular.businessrpreport.util;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class TableColumn {
+    private String title;
+    private String align;
+    private String dataIndex;
+
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/util/TableColumns.java

@@ -0,0 +1,13 @@
+package com.unis.rotationPlan.info.modular.businessrpreport.util;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class TableColumns {
+    private UnitInfo unitInfo;
+    private OrgInfo orgInfo;
+    private Grain grain;
+
+}

unis-plugin/unis-plugin-biz/src/main/java/com/unis/rotationPlan/info/modular/businessrpreport/util/UnitInfo.java

@@ -0,0 +1,15 @@
+package com.unis.rotationPlan.info.modular.businessrpreport.util;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class UnitInfo {
+
+    private String title;
+    private String align;
+    private String dataIndex;
+
+
+}