From a3bdf2f96a06c1551bdf17c014b27f7fe527a8ab Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 14 三月 2024 17:55:42 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java | 6 +++---
ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatCaseMapper.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatCaseServiceImpl.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java | 7 ++++---
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatExpenseServiceImpl.java | 2 +-
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml | 2 +-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 2 +-
12 files changed, 17 insertions(+), 16 deletions(-)
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 e1796c0..2ce7c45 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
@@ -36,10 +36,10 @@
private String padeptno = "";
/**
- * pauserno
+ * pausername
*/
- @ApiModelProperty("pauserno")
- private String pauserno = "";
+ @ApiModelProperty("pausername")
+ private String pausername = "";
/**
* 缁╂晥绫诲瀷锛�1銆佹湀搴︺��2銆佸搴︺��3銆佸勾搴�
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 9c7017e..73042be 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 String pausername = "";
/**
* pacasestate
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 0daaff5..dd6f857 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
@@ -33,11 +33,12 @@
@ApiModelProperty("padeptno")
private String padeptno = "";
+
/**
- * pauserno
+ * pausername
*/
- @ApiModelProperty("pauserno")
- private String pauserno = "";
+ @ApiModelProperty("pausername")
+ private String pausername = "";
/**
* pacasestate
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 d65186c..2b65341 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") String PABONUSTYPE);
+ List<SpStatBonus> getListBySpStatBonus(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME, @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 0cec29e..45ca1ad 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
@@ -17,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("PAUSERNAME") String PAUSERNAME, @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
index b714d3d..25ea9f2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpstatExpenseMapper.java
@@ -18,6 +18,6 @@
@Mapper
public interface SpstatExpenseMapper extends BaseMapper<SpStatExpense> {
- List<SpStatExpense> getListBySpstatExpense(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") String PAUSERNO, @Param("PAEXPENSETYPE") String PAEXPENSETYPE);
+ List<SpStatExpense> getListBySpstatExpense(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME, @Param("PAEXPENSETYPE") String PAEXPENSETYPE);
}
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 559ef72..8be5a85 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
@@ -480,6 +480,6 @@
@Override
public List<SpStatBonus> getListBySpStatBonus(SpStatBonusReq spStatBonusReq) {
- return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPauserno(), spStatBonusReq.getPabonustype());
+ return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername(), spStatBonusReq.getPabonustype());
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatCaseServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatCaseServiceImpl.java
index 50d1ac2..f202be9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatCaseServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatCaseServiceImpl.java
@@ -45,7 +45,7 @@
@Override
public List<SpStatCase> getListBypower(SpStatCaseReq spStatCaseReq) {
- return spstatCaseMapper.getListBypower(spStatCaseReq.getPabegtime(), spStatCaseReq.getPaendtime(), spStatCaseReq.getPadeptno(), spStatCaseReq.getPauserno(), spStatCaseReq.getPacasestate());
+ return spstatCaseMapper.getListBypower(spStatCaseReq.getPabegtime(), spStatCaseReq.getPaendtime(), spStatCaseReq.getPadeptno(), spStatCaseReq.getPausername(), spStatCaseReq.getPacasestate());
}
}
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
index d111a5f..18ca08f 100644
--- 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
@@ -28,7 +28,7 @@
@Override
public List<SpStatExpense> getListBySpstatExpense(SpStatExpenseReq spStatExpenseReq) {
- return spstatExpenseMapper.getListBySpstatExpense(spStatExpenseReq.getPabegtime(), spStatExpenseReq.getPaendtime(), spStatExpenseReq.getPadeptno(), spStatExpenseReq.getPauserno(), spStatExpenseReq.getPaexpensetype());
+ return spstatExpenseMapper.getListBySpstatExpense(spStatExpenseReq.getPabegtime(), spStatExpenseReq.getPaendtime(), spStatExpenseReq.getPadeptno(), spStatExpenseReq.getPausername(), spStatExpenseReq.getPaexpensetype());
}
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
index fe31d26..81b759d 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
@@ -7,7 +7,7 @@
<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=VARCHAR
+ call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR
})
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
index 1717785..7dabce4 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
@@ -7,7 +7,7 @@
<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
+ call `SP_STAT_CASE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,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/SpstatExpenseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml
index afac424..7823ed2 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml
@@ -7,6 +7,6 @@
<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=VARCHAR},#{PAEXPENSETYPE,mode=IN,jdbcType=VARCHAR})
+ call `SP_STAT_EXPENSE`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR},#{PAEXPENSETYPE,mode=IN,jdbcType=VARCHAR})
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3