From 11978f0ae51b13a6f2b06979ef0573fa78fc6459 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 12 三月 2024 16:27:51 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 1
ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml | 3 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.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/SpStatBonus.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java | 27 +++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 6 ++
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java | 4 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java | 6 +-
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFunddetailMapper.java | 2 -
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml | 13 ++++++
17 files changed, 61 insertions(+), 19 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 90918ba..63356ee 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
@@ -161,7 +161,7 @@
@ApiOperation("鏀惰垂缁熻")
@PostMapping("/getListBySpStatChange")
- public TableDataInfo getListBySpStatChange(SpStatChangeReq spStatChangeReq) {
+ public TableDataInfo getListBySpStatChange(@RequestBody SpStatChangeReq spStatChangeReq) {
return getDataTable(serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq));
}
}
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 9d600a5..88b364d 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
@@ -185,7 +185,6 @@
* 鏌ヨ缁╂晥濂栭噾缁熻
*/
@ApiOperation("鏌ヨ缁╂晥濂栭噾缁熻")
- //@PreAuthorize("@ss.hasPermi('project:fund:list')")
@PostMapping("/getListBySpStatBonus")
public TableDataInfo getListBySpStatBonus(@RequestBody SpStatBonusReq spStatBonusReq) {
startPage();
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 4aa9763..285b984 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
@@ -27,7 +27,7 @@
* 缁╂晥鏃ユ湡
*/
@ApiModelProperty("缁╂晥鏃ユ湡")
- private String jxrq;
+ private String bonusmonth;
/**
* 閮ㄩ棬id
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 8bae7e4..2d9dc19 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
@@ -38,13 +38,13 @@
* pauserno
*/
@ApiModelProperty("pauserno")
- private Integer pauserno;
+ private String pauserno;
/**
* pabonustype
*/
@ApiModelProperty("pabonustype")
- private String pabonustype;
+ private Integer 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 0dada2d..ae9dac9 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 Integer pauserno;
+ private String 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
index 3c7f39d..6edd4d5 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
@@ -28,9 +28,9 @@
/**
* 鎺ユ敹鏈堜唤
*/
- @ApiModelProperty("鎺ユ敹鏈堜唤")
- @JsonFormat(pattern = "yyyy-MM")
- private Date receivemonth;
+// @ApiModelProperty("鎺ユ敹鏈堜唤")
+// @JsonFormat(pattern = "yyyy-MM")
+ private String receivemonth;
/**
* 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤
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 5a9d939..ed4951f 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
@@ -37,7 +37,7 @@
* pauserno
*/
@ApiModelProperty("pauserno")
- private Integer pauserno;
+ private String pauserno;
/**
* pacasestate
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 7827249..ee1c509 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
@@ -57,6 +57,4 @@
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/SpStatBonusMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java
new file mode 100644
index 0000000..eb85e26
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java
@@ -0,0 +1,27 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.FunddetailReqVo;
+import com.ruoyi.project.domain.ServiceFunddetail;
+import com.ruoyi.project.domain.SpStatBonus;
+import com.ruoyi.project.domain.vo.TaxMoneyByItemEO;
+import com.ruoyi.project.domain.vo.TaxMoneySumEO;
+import com.ruoyi.project.domain.vo.TaxMoneyVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 璐圭敤鐢宠鏄庣粏Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2022-01-25
+ */
+@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);
+
+}
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 c0636d3..0cec29e 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") Integer PAUSERNO, @Param("PACASESTATE") String PACASESTATE);
+ List<SpStatCase> getListBypower(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") String 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
index ed8df5e..b714d3d 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") Integer PAUSERNO, @Param("PAEXPENSETYPE") String PAEXPENSETYPE);
+ List<SpStatExpense> getListBySpstatExpense(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNO") String PAUSERNO, @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 7222d08..559ef72 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
@@ -16,6 +16,7 @@
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.ServiceFundMapper;
+import com.ruoyi.project.mapper.SpStatBonusMapper;
import lombok.extern.flogger.Flogger;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -46,6 +47,9 @@
@Autowired
ServiceFundMapper serviceFundMapper;
+
+ @Autowired
+ SpStatBonusMapper spStatBonusMapper;
/**
@@ -476,6 +480,6 @@
@Override
public List<SpStatBonus> getListBySpStatBonus(SpStatBonusReq spStatBonusReq) {
- return serviceFunddetailMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPauserno(), spStatBonusReq.getPabonustype());
+ return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPauserno(), spStatBonusReq.getPabonustype());
}
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index d32efbc..984852b 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -150,7 +150,7 @@
<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}
+ 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/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index fb124b3..9f09a61 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -300,7 +300,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=INTEGER},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR})
+ 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
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
new file mode 100644
index 0000000..5f292bb
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
@@ -0,0 +1,13 @@
+<?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.SpStatBonusMapper">
+
+
+ <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})
+ </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 6f027b9..1717785 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
@@ -7,6 +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=INTEGER},#{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=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 c3d0b6c..afac424 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=INTEGER},#{PAEXPENSETYPE,mode=IN,jdbcType=VARCHAR})
+ 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})
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3