liusheng
2024-03-12 f352146410f49602eaa6b94bb8a09d5913fffe0a
代码提交
已修改11个文件
126 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
@@ -48,5 +48,18 @@
    @Excel(name = "收益人编号")
    private String beneficiaryno;
    /**
     * 收益人编号
     */
    @ApiModelProperty("收益人")
    @Excel(name = "收益人")
    private String beneficiaryname;
    /**
     * 收益人编号
     */
    @ApiModelProperty("申请金额")
    @Excel(name = "申请金额")
    private double amount;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.lang.NonNull;
/**
 * SP_STAT_BONUS
@@ -20,31 +21,31 @@
     * pabegtime
     */
    @ApiModelProperty("pabegtime")
    private String pabegtime;
    private String pabegtime = "";
    /**
     * deppaendtimetid
     */
    @ApiModelProperty("paendtime")
    private String paendtime;
    private String paendtime = "";
    /**
     * padeptno
     */
    @ApiModelProperty("padeptno")
    private String padeptno;
    private String padeptno = "";
    /**
     * pauserno
     */
    @ApiModelProperty("pauserno")
    private String pauserno;
    private String pauserno = "";
    /**
     * pabonustype
     * 绩效类型:1、月度、2、季度、3、年度
     */
    @ApiModelProperty("pabonustype")
    private Integer pabonustype;
    @ApiModelProperty("绩效类型:1、月度、2、季度、3、年度")
    private String pabonustype = "";
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
@@ -41,17 +41,17 @@
    @ApiModelProperty("deptname")
    private String deptname;
    /**
     * reporterno
     */
    @ApiModelProperty("reporterno")
    private String reporterno;
    /**
     * reportername
     */
    @ApiModelProperty("reportername")
    private String reportername;
//    /**
//     * reporterno
//     */
//    @ApiModelProperty("reporterno")
//    private String reporterno;
//
//    /**
//     * reportername
//     */
//    @ApiModelProperty("reportername")
//    private String reportername;
    /**
     * casesum
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java
@@ -20,31 +20,31 @@
     * pabegtime
     */
    @ApiModelProperty("pabegtime")
    private String pabegtime;
    private String pabegtime = "";
    /**
     * paendtime
     */
    @ApiModelProperty("paendtime")
    private String paendtime;
    private String paendtime = "";
    /**
     * padeptno
     */
    @ApiModelProperty("padeptno")
    private String padeptno;
    private String padeptno = "";
    /**
     * pauserno
     */
    @ApiModelProperty("pauserno")
    private String pauserno;
    private String pauserno = "";
    /**
     * pacasestate
     */
    @ApiModelProperty("pacasestate")
    private String pacasestate;
    private String pacasestate = "";
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java
@@ -26,6 +26,12 @@
    private String hospitalno;
    /**
     * 医院名称
     */
    @ApiModelProperty("医院名称")
    private String hospitalname;
    /**
     * 接收月份
     */
//    @ApiModelProperty("接收月份")
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java
@@ -20,7 +20,7 @@
     * 医院编号
     */
    @ApiModelProperty("医院编号")
    private String pahospitalno;
    private String pahospitalno = "";
    /**
     * 0:未收款情况   1:已收款统计
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
@@ -16,37 +16,6 @@
public class SpStatExpense {
    private static final long serialVersionUID = 1L;
    /**
     * 绩效日期
     */
    @ApiModelProperty("绩效日期")
    private String pabegtime;
    /**
     * 部门id
     */
    @ApiModelProperty("部门id")
    private String paendtime;
    /**
     * 部门名称
     */
    @ApiModelProperty("部门名称")
    private String padeptno;
    /**
     * 收益人编号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String pauserno;
    /**
     * 收益人编号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String paexpensetype;
    /**
     * 收益人编号
@@ -79,8 +48,8 @@
    /**
     * 收益人编号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    @ApiModelProperty("收益人")
    @Excel(name = "收益人")
    private String deptmentName;
    /**
@@ -90,5 +59,12 @@
    @Excel(name = "收益人编号")
    private String amount;
    /**
     * 收益人编号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String applyType;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java
@@ -19,31 +19,31 @@
     * pabegtime
     */
    @ApiModelProperty("pabegtime")
    private String pabegtime;
    private String pabegtime = "";
    /**
     * paendtime
     */
    @ApiModelProperty("paendtime")
    private String paendtime;
    private String paendtime = "";
    /**
     * padeptno
     */
    @ApiModelProperty("padeptno")
    private String padeptno;
    private String padeptno = "";
    /**
     * pauserno
     */
    @ApiModelProperty("pauserno")
    private String pauserno;
    private String pauserno = "";
    /**
     * pacasestate
     */
    @ApiModelProperty("paexpensetype")
    private String paexpensetype;
    private String paexpensetype = "";
}
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java
@@ -22,6 +22,6 @@
@Mapper
public interface SpStatBonusMapper extends BaseMapper<SpStatBonus> {
    List<SpStatBonus> getListBySpStatBonus(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") String PAUSERNO, @Param("PABONUSTYPE") Integer PABONUSTYPE);
    List<SpStatBonus> getListBySpStatBonus(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") String PAUSERNO, @Param("PABONUSTYPE") String PABONUSTYPE);
}
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
@@ -7,7 +7,8 @@
    <select id="getListBySpStatBonus" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.SpStatBonus">
        call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=INTEGER})
        call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR
        })
    </select>
</mapper>