From f352146410f49602eaa6b94bb8a09d5913fffe0a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 12 三月 2024 18:24:48 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java | 22 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 1
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java | 15 ++--
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java | 13 ++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java | 10 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java | 6 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java | 10 +-
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java | 42 +++-----------
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml | 3
11 files changed, 62 insertions(+), 64 deletions(-)
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 88b364d..3890e4a 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
@@ -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;
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
index 285b984..606f64b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
+++ b/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;
+
}
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
index 2d9dc19..e1796c0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java
+++ b/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 = "";
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
index 564627a..dcd24d3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
+++ b/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
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..9c7017e 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
@@ -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 = "";
}
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
index 6edd4d5..c2c4b21 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java
@@ -26,6 +26,12 @@
private String hospitalno;
/**
+ * 鍖婚櫌鍚嶇О
+ */
+ @ApiModelProperty("鍖婚櫌鍚嶇О")
+ private String hospitalname;
+
+ /**
* 鎺ユ敹鏈堜唤
*/
// @ApiModelProperty("鎺ユ敹鏈堜唤")
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
index d089020..0ef2d3d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java
@@ -20,7 +20,7 @@
* 鍖婚櫌缂栧彿
*/
@ApiModelProperty("鍖婚櫌缂栧彿")
- private String pahospitalno;
+ private String pahospitalno = "";
/**
* 0:鏈敹娆炬儏鍐� 1:宸叉敹娆剧粺璁�
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
index 4720e33..f8a66bf 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
+++ b/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;
+
}
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
index ed4951f..0daaff5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java
+++ b/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 = "";
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java
index eb85e26..d65186c 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java
+++ b/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);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
index 5f292bb..fe31d26 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
+++ b/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>
\ No newline at end of file
--
Gitblit v1.9.3