From 7a1a246539b16c7e81006fb79dd2885d94aa8c01 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 11 三月 2024 18:14:10 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java | 7
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatCaseMapper.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java | 23 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java | 52 +++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java | 50 +++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecomporgan.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java | 44 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java | 33 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java | 12
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java | 55 +++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java | 8
ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml | 12 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 11 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java | 94 +++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/SpstatExpenseService.java | 19 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatExpenseServiceImpl.java | 34 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 11
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java | 13 +
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 14 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java | 50 +++++
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java | 9
29 files changed, 557 insertions(+), 35 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
index 572d096..90918ba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
+++ b/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));
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index a4587de..7362e09 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -2206,8 +2206,5 @@
dataMap.put("downloadName", msg);
return AjaxResult.success(dataMap);
-
-
}
-
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
index f0265e1..9d600a5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
+++ b/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));
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java
index ed39a62..713cfb3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java
+++ b/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;
/**
- * 璐圭敤鐢宠涓籆ontroller
+ * 妗堜緥缁熻
*
* @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));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java
new file mode 100644
index 0000000..2098f7c
--- /dev/null
+++ b/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));
+ }
+
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecomporgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecomporgan.java
index ad7eb53..2ef1529 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecomporgan.java
+++ b/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;
/**
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
new file mode 100644
index 0000000..4aa9763
--- /dev/null
+++ b/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;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java
new file mode 100644
index 0000000..8bae7e4
--- /dev/null
+++ b/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;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java
index ae9dac9..0dada2d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java
+++ b/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
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java
new file mode 100644
index 0000000..3c7f39d
--- /dev/null
+++ b/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;
+
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java
new file mode 100644
index 0000000..d089020
--- /dev/null
+++ b/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;
+
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
new file mode 100644
index 0000000..4720e33
--- /dev/null
+++ b/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;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java
new file mode 100644
index 0000000..5a9d939
--- /dev/null
+++ b/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;
+
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
index d405e32..2e86ef9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
+++ b/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);
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java
index 59f3295..7827249 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java
+++ b/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);
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatCaseMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatCaseMapper.java
index a6cccc4..c0636d3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatCaseMapper.java
+++ b/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);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java
new file mode 100644
index 0000000..ed8df5e
--- /dev/null
+++ b/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;
+
+/**
+ * 璐圭敤鐢宠涓籑apper鎺ュ彛
+ *
+ * @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);
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
index ae2aa12..fbe3848 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonorchargeorganService.java
+++ b/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);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
index af3b14b..fd78af6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
+++ b/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);
+
}
\ No newline at end of file
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
index 47799aa..cc2ccfb 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
+++ b/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);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/SpstatExpenseService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/SpstatExpenseService.java
new file mode 100644
index 0000000..d90f5e1
--- /dev/null
+++ b/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;
+
+/**
+ * 璐圭敤鐢宠涓籗ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2022-01-24
+ */
+public interface SpstatExpenseService {
+
+ public List<SpStatExpense> getListBySpstatExpense(SpStatExpenseReq spStatExpenseReq);
+}
\ No newline at end of file
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
index eacd1f6..edfffc8 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
+++ b/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());
+ }
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index 3f9541f..7222d08 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/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());
+ }
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatExpenseServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatExpenseServiceImpl.java
new file mode 100644
index 0000000..d111a5f
--- /dev/null
+++ b/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;
+
+/**
+ * 璐圭敤鐢宠涓籗ervice涓氬姟灞傚鐞�
+ *
+ * @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());
+ }
+
+}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index a77c71a..d32efbc 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 5f96bcf..955a7b7 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index a2e4c8a..8bf3cb4 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/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 < #{taxTime}
and a.tax_time >= #{firstDay}
and TRIM(a.IDCardNo) = #{IDCard}
and a.del_flag != 1
and b.id != #{fundID}
- and b.fundtaxtime < #{taxTime}
+ and b.fundtaxtime
+ < #{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>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
index e6aab7f..6d25ecf 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
+++ b/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>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml
new file mode 100644
index 0000000..d0ef741
--- /dev/null
+++ b/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>
\ No newline at end of file
--
Gitblit v1.9.3