liusheng
2024-03-11 7a1a246539b16c7e81006fb79dd2885d94aa8c01
代码提交
已添加11个文件
已修改18个文件
592 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecomporgan.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatCaseMapper.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/SpstatExpenseService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatExpenseServiceImpl.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -12,10 +12,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.RbDetailFile;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.domain.ServiceDonorchargeorganVO;
import com.ruoyi.project.domain.ServiceFunddetailVO;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -161,4 +158,10 @@
        }
        return toAjax(i);
    }
    @ApiOperation("收费统计")
    @PostMapping("/getListBySpStatChange")
    public TableDataInfo getListBySpStatChange(SpStatChangeReq spStatChangeReq) {
        return getDataTable(serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -2206,8 +2206,5 @@
        dataMap.put("downloadName", msg);
        return AjaxResult.success(dataMap);
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.SpStatBonusReq;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
import com.ruoyi.project.service.IServiceFunddetailService;
import io.swagger.annotations.Api;
@@ -180,4 +181,14 @@
//        return AjaxResult.success(serviceFunddetailService.performance(serviceFunddetail));
//    }
    /**
     * æŸ¥è¯¢ç»©æ•ˆå¥–金统计
     */
    @ApiOperation("查询绩效奖金统计")
    //@PreAuthorize("@ss.hasPermi('project:fund:list')")
    @PostMapping("/getListBySpStatBonus")
    public TableDataInfo getListBySpStatBonus(@RequestBody SpStatBonusReq spStatBonusReq) {
        startPage();
        return getDataTable(serviceFunddetailService.getListBySpStatBonus(spStatBonusReq));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java
@@ -48,13 +48,13 @@
import static com.ruoyi.web.controller.project.ServiceReimbursementController.convert;
/**
 * è´¹ç”¨ç”³è¯·ä¸»Controller
 * æ¡ˆä¾‹ç»Ÿè®¡
 *
 * @author ruoyi
 * @date 2022-01-24
 */
@Slf4j
@Api("费用申请主")
@Api("案例统计")
@RestController
@RequestMapping("/project/spstatcase")
public class SpStatCaseController extends BaseController {
@@ -63,11 +63,11 @@
    SpstatCaseService spstatCaseService;
    /**
     * æŸ¥è¯¢è´¹ç”¨ç”³è¯·ä¸»åˆ—表
     * æŸ¥è¯¢æ¡ˆä¾‹ç»Ÿè®¡
     */
    @ApiOperation("查询费用申请主列表")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody SpStatCaseReq spStatCaseReq) {
    @ApiOperation("查询案例统计")
    @PostMapping("/spStatCaselist")
    public TableDataInfo spStatCaselist(@RequestBody SpStatCaseReq spStatCaseReq) {
        startPage();
        return getDataTable(spstatCaseService.getListBypower(spStatCaseReq));
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
package com.ruoyi.web.controller.project;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.project.domain.SpStatCaseReq;
import com.ruoyi.project.domain.SpStatExpenseReq;
import com.ruoyi.project.service.SpstatCaseService;
import com.ruoyi.project.service.SpstatExpenseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * æŠ¥é”€ç»Ÿè®¡
 *
 * @author ruoyi
 * @date 2022-01-24
 */
@Slf4j
@Api("报销统计")
@RestController
@RequestMapping("/project/spstatexpense")
public class SpStatExpenseController extends BaseController {
    @Autowired
    SpstatExpenseService spstatExpenseService;
    /**
     * æŸ¥è¯¢æ¡ˆä¾‹ç»Ÿè®¡
     */
    @ApiOperation("查询报销统计")
    @PostMapping("/spStatExpenselist")
    public TableDataInfo spStatExpenselist(@RequestBody SpStatExpenseReq spStatExpenseReq) {
        startPage();
        return getDataTable(spstatExpenseService.getListBySpstatExpense(spStatExpenseReq));
    }
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecomporgan.java
@@ -69,8 +69,8 @@
     * ç§»æ¤æ—¶é—´
     */
    @ApiModelProperty("移植时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "移植时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "移植时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date transplanttime;
    /**
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
package com.ruoyi.project.domain;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * SP_STAT_BONUS
 *
 * @author ls
 * @date 2024-03-11
 */
@Data
@ApiModel("SP_STAT_BONUS")
public class SpStatBonus {
    private static final long serialVersionUID = 1L;
    /**
     * ç»©æ•ˆï¼š1、月度、2季度、3年度
     */
    @ApiModelProperty("绩效:1、月度、2季度、3年度")
    @Excel(name = "绩效:1、月度、2季度、3年度")
    private Integer performancetype;
    /**
     * ç»©æ•ˆæ—¥æœŸ
     */
    @ApiModelProperty("绩效日期")
    private String jxrq;
    /**
     * éƒ¨é—¨id
     */
    @ApiModelProperty("部门id")
    private Long deptId;
    /**
     * éƒ¨é—¨åç§°
     */
    @ApiModelProperty("部门名称")
    private String deptName;
    /**
     * æ”¶ç›Šäººç¼–号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String beneficiaryno;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
package com.ruoyi.project.domain;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * SP_STAT_BONUS
 *
 * @author ls
 * @date 2024-03-11
 */
@Data
@ApiModel("SpStatBonusReq")
public class SpStatBonusReq {
    private static final long serialVersionUID = 1L;
    /**
     * pabegtime
     */
    @ApiModelProperty("pabegtime")
    private String pabegtime;
    /**
     * deppaendtimetid
     */
    @ApiModelProperty("paendtime")
    private String paendtime;
    /**
     * padeptno
     */
    @ApiModelProperty("padeptno")
    private String padeptno;
    /**
     * pauserno
     */
    @ApiModelProperty("pauserno")
    private Integer pauserno;
    /**
     * pabonustype
     */
    @ApiModelProperty("pabonustype")
    private String pabonustype;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java
@@ -38,7 +38,7 @@
     * pauserno
     */
    @ApiModelProperty("pauserno")
    private String pauserno;
    private Integer pauserno;
    /**
     * pacasestate
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package com.ruoyi.project.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * SP_STAT_EXPENSE
 *
 * @author ls
 * @date 2024-03-11
 */
@Data
@ApiModel("SP_STAT_CHANGE ")
public class SpStatChange {
    private static final long serialVersionUID = 1L;
    /**
     * åŒ»é™¢ç¼–号
     */
    @ApiModelProperty("医院编号")
    private String hospitalno;
    /**
     * æŽ¥æ”¶æœˆä»½
     */
    @ApiModelProperty("接收月份")
    @JsonFormat(pattern = "yyyy-MM")
    private Date receivemonth;
    /**
     * å™¨å®˜å®žé™…收到费用
     */
    @ApiModelProperty("器官实际收到费用")
    private double amount;
    /**
     * nonpayment
     */
    @ApiModelProperty("nonpayment")
    private double nonpayment;
    /**
     * organcharge
     */
    @ApiModelProperty("organcharge")
    private double organcharge;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.ruoyi.project.domain;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * SP_STAT_EXPENSE
 *
 * @author ls
 * @date 2024-03-11
 */
@Data
@ApiModel("SpStatChangeReq")
public class SpStatChangeReq {
    private static final long serialVersionUID = 1L;
    /**
     * åŒ»é™¢ç¼–号
     */
    @ApiModelProperty("医院编号")
    private String pahospitalno;
    /**
     * 0:未收款情况   1:已收款统计
     */
    @ApiModelProperty("0:未收款情况   1:已收款统计")
    private String pachageflag;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
package com.ruoyi.project.domain;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * SP_STAT_EXPENSE
 *
 * @author ls
 * @date 2024-03-11
 */
@Data
@ApiModel("SP_STAT_EXPENSE")
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;
    /**
     * æ”¶ç›Šäººç¼–号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String applymonth;
    /**
     * æ”¶ç›Šäººç¼–号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String userno;
    /**
     * æ”¶ç›Šäººç¼–号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String username;
    /**
     * æ”¶ç›Šäººç¼–号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String deptmentno;
    /**
     * æ”¶ç›Šäººç¼–号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String deptmentName;
    /**
     * æ”¶ç›Šäººç¼–号
     */
    @ApiModelProperty("收益人编号")
    @Excel(name = "收益人编号")
    private String amount;
}
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
package com.ruoyi.project.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * SP_STAT_EXPENSE
 *
 * @author ls
 * @date 2024-03-07
 */
@Data
@ApiModel("SpStatExpenseReq")
public class SpStatExpenseReq {
    private static final long serialVersionUID = 1L;
    /**
     * pabegtime
     */
    @ApiModelProperty("pabegtime")
    private String pabegtime;
    /**
     * paendtime
     */
    @ApiModelProperty("paendtime")
    private String paendtime;
    /**
     * padeptno
     */
    @ApiModelProperty("padeptno")
    private String padeptno;
    /**
     * pauserno
     */
    @ApiModelProperty("pauserno")
    private Integer pauserno;
    /**
     * pacasestate
     */
    @ApiModelProperty("paexpensetype")
    private String paexpensetype;
}
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.domain.SpStatBonus;
import com.ruoyi.project.domain.SpStatChange;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -22,7 +25,12 @@
     * @return æçŒ®å™¨å®˜é›†åˆ
     */
    public List<ServiceDonorchargeorgan> selectServiceDonorchargeorganList(ServiceDonorchargeorgan serviceDonorchargeorgan);
    public List<ServiceDonorchargeorgan> queryListBypaymentidIsNull(ServiceDonorchargeorgan serviceDonorchargeorgan);
    public Boolean updateDonorchargeorgan(ServiceDonorchargeorgan serviceDonorchargeorgan);
    public List<SpStatChange> getListBySpStatChange(@Param("PAHOSPITALNO") String PAHOSPITALNO, @Param("PACHAGEFLAG") String PACHAGEFLAG);
}
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java
@@ -7,6 +7,8 @@
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.SpStatBonus;
import com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut;
import com.ruoyi.project.domain.vo.TaxMoneyByItemEO;
import com.ruoyi.project.domain.vo.TaxMoneySumEO;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
@@ -54,4 +56,7 @@
    TaxMoneySumEO getTaxSum(TaxMoneyByItemEO taxMoneyByItemEO);
    List<ServiceFunddetail> totlaTax(List<Long> fundids);
    List<SpStatBonus> getListBySpStatBonus(@Param("PABEGTIME ") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") Integer PAUSERNO, @Param("PABONUSTYPE") String PABONUSTYPE);
}
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatCaseMapper.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceFund;
import com.ruoyi.project.domain.SpStatCase;
import com.ruoyi.project.domain.vo.FundVO;
import com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -20,6 +17,6 @@
@Mapper
public interface SpstatCaseMapper extends BaseMapper<SpStatCase> {
    List<SpStatCase> getListBypower(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") String PAUSERNO, @Param("PACASESTATE") String PACASESTATE);
    List<SpStatCase> getListBypower(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") Integer PAUSERNO, @Param("PACASESTATE") String PACASESTATE);
}
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.ruoyi.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.SpStatCase;
import com.ruoyi.project.domain.SpStatExpense;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * è´¹ç”¨ç”³è¯·ä¸»Mapper接口
 *
 * @author ruoyi
 * @date 2022-01-24
 */
@Mapper
public interface SpstatExpenseMapper extends BaseMapper<SpStatExpense> {
    List<SpStatExpense> getListBySpstatExpense(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") Integer PAUSERNO, @Param("PAEXPENSETYPE") String PAEXPENSETYPE);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.domain.SpStatChange;
import com.ruoyi.project.domain.SpStatChangeReq;
import java.util.List;
@@ -24,4 +26,11 @@
    public Boolean updateDonorchargeorgan(ServiceDonorchargeorgan serviceDonorchargeorgan);
    public List<ServiceDonorchargeorgan> queryListBypaymentidIsNull(ServiceDonorchargeorgan serviceDonorchargeorgan);
    /**
     * æ”¶è´¹ç»Ÿè®¡
     * @param spStatChangeReq
     * @return
     */
    public List<SpStatChange> getListBySpStatChange(SpStatChangeReq spStatChangeReq);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
@@ -4,9 +4,7 @@
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceFund;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.ServiceFunddetailExcel;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import org.springframework.web.bind.annotation.PathVariable;
@@ -69,4 +67,5 @@
    Map<String, List<ServiceFunddetailExcel>> totaltax(TotalTaxVO totalTaxVO);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
@@ -5,9 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.ServiceFunddetailVO;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.TaxMoneyVO;
import com.ruoyi.project.domain.vo.TaxedMoneyVO;
import org.springframework.web.bind.annotation.PathVariable;
@@ -75,4 +73,13 @@
     * beneficiaryNO  å—益人编号
     */
    Map<String, Double> performance(ServiceFunddetail serviceFunddetail);
    /**
     * ç»©æ•ˆå¥–金统计
     *
     * @param spStatBonusReq
     * @return
     */
    public List<SpStatBonus> getListBySpStatBonus(SpStatBonusReq spStatBonusReq);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/SpstatExpenseService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ruoyi.project.service;
import com.ruoyi.project.domain.SpStatCase;
import com.ruoyi.project.domain.SpStatCaseReq;
import com.ruoyi.project.domain.SpStatExpense;
import com.ruoyi.project.domain.SpStatExpenseReq;
import java.util.List;
/**
 * è´¹ç”¨ç”³è¯·ä¸»Service接口
 *
 * @author ruoyi
 * @date 2022-01-24
 */
public interface SpstatExpenseService {
    public List<SpStatExpense> getListBySpstatExpense(SpStatExpenseReq spStatExpenseReq);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.domain.SpStatChange;
import com.ruoyi.project.domain.SpStatChangeReq;
import com.ruoyi.project.mapper.ServiceDonorchargeorganMapper;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -107,4 +109,9 @@
        return serviceDonorchargeorgans;
    }
    @Override
    public List<SpStatChange> getListBySpStatChange(SpStatChangeReq spStatChangeReq) {
        return serviceDonorchargeorganMapper.getListBySpStatChange(spStatChangeReq.getPahospitalno(), spStatChangeReq.getPachageflag());
    }
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -473,4 +473,9 @@
        return map;
    }
    @Override
    public List<SpStatBonus> getListBySpStatBonus(SpStatBonusReq spStatBonusReq) {
        return serviceFunddetailMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPauserno(), spStatBonusReq.getPabonustype());
    }
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatExpenseServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package com.ruoyi.project.service.impl;
import com.ruoyi.project.domain.SpStatCase;
import com.ruoyi.project.domain.SpStatCaseReq;
import com.ruoyi.project.domain.SpStatExpense;
import com.ruoyi.project.domain.SpStatExpenseReq;
import com.ruoyi.project.mapper.SpstatCaseMapper;
import com.ruoyi.project.mapper.SpstatExpenseMapper;
import com.ruoyi.project.service.SpstatCaseService;
import com.ruoyi.project.service.SpstatExpenseService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * è´¹ç”¨ç”³è¯·ä¸»Service业务层处理
 *
 * @author ruoyi
 * @date 2022-01-24
 */
@Slf4j
@Service
public class SpstatExpenseServiceImpl implements SpstatExpenseService {
    @Autowired
    SpstatExpenseMapper spstatExpenseMapper;
    @Override
    public List<SpStatExpense> getListBySpstatExpense(SpStatExpenseReq spStatExpenseReq) {
        return spstatExpenseMapper.getListBySpstatExpense(spStatExpenseReq.getPabegtime(), spStatExpenseReq.getPaendtime(), spStatExpenseReq.getPadeptno(), spStatExpenseReq.getPauserno(), spStatExpenseReq.getPaexpensetype());
    }
}
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -148,4 +148,9 @@
        where id = #{id} and del_flag=0
    </update>
    <select id="getListBySpStatChange" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.SpStatChange">
        call `SP_STAT_CHANGE`(#{PAHOSPITALNO,mode=IN,jdbcType=VARCHAR},#{PACHAGEFLAG,mode=IN,jdbcType=VARCHAR}
    </select>
</mapper>
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -261,9 +261,4 @@
            resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
        call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{donorname,mode=IN,jdbcType=VARCHAR})
    </select>
    <select id="getListBypower" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.SpStatCase">
        call `SP_STAT_CASE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PACASESTATE,mode=IN,jdbcType=VARCHAR})
    </select>
</mapper>
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -272,17 +272,20 @@
    <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
            resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
        SELECT sum(a.Amount) amounts, sum(a.TaxAmount) taxAmounts, sum(a.TaxedAmount) taxedAmounts
        FROM service_funddetail a,service_fund b
        FROM service_funddetail a,
             service_fund b
        where a.FundID = b.id
          and a.tax_time &lt; #{taxTime}
          and a.tax_time >= #{firstDay}
          and TRIM(a.IDCardNo) = #{IDCard}
          and a.del_flag != 1
          and b.id != #{fundID}
          and b.fundtaxtime &lt; #{taxTime}
          and b.fundtaxtime
         &lt; #{taxTime}
          and b.fundtaxtime >= #{firstDay}
          and b.del_flag != 1
          and b.ApplyType in (1, 2)
          and b.ApplyType in (1
            , 2)
    </select>
    <select id="totlaTax" resultType="com.ruoyi.project.domain.ServiceFunddetail">
@@ -295,4 +298,9 @@
        and del_flag=0
    </select>
    <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=INT},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR})
    </select>
</mapper>
ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
@@ -7,6 +7,6 @@
    <select id="getListBypower" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.SpStatCase">
        call `SP_STAT_CASE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PACASESTATE,mode=IN,jdbcType=VARCHAR})
        call `SP_STAT_CASE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=INT},#{PACASESTATE,mode=IN,jdbcType=VARCHAR})
    </select>
</mapper>
ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
<?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.ruoyi.project.mapper.SpstatExpenseMapper">
    <select id="getListBySpstatExpense" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.SpStatExpense">
        call `SP_STAT_EXPENSE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=INT},#{PAEXPENSETYPE,mode=IN,jdbcType=VARCHAR})
    </select>
</mapper>