From a66c1525b1a959eed00da4c7151e097900fb0ca2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 13 五月 2024 14:51:08 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 4 ++--
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java | 4 ++--
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpSelectExpertfee.java | 20 ++++++++------------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 5 +++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 4 ++--
5 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 500e32d..3bc90f9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -232,8 +232,8 @@
}
@ApiOperation("娓呯悊閿欒娆℃暟")
- @GetMapping("/cleanErrorNums")
- public AjaxResult cleanErrorNums(@RequestParam("userName") String userName) {
+ @GetMapping("/cleanErrorNums/{userName}")
+ public AjaxResult cleanErrorNums(@PathVariable String userName) {
return AjaxResult.success(userService.cleanErrorNums(userName));
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpSelectExpertfee.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpSelectExpertfee.java
index 3a92831..e9685f6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpSelectExpertfee.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpSelectExpertfee.java
@@ -2,9 +2,11 @@
import com.ruoyi.common.core.page.PageDomain;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+@ApiModel("SpSelectExpertfee瀛樺偍杩囩▼")
@Data
public class SpSelectExpertfee extends PageDomain {
@@ -22,22 +24,16 @@
/**
- * 瀹℃牳浜猴紝047鏄檲鎱曞崕
+ * 绠楃◣ID
*/
- @ApiModelProperty("瀹℃牳浜猴紝047鏄檲鎱曞崕")
- private String pacheckno = "";
+ @ApiModelProperty("绠楃◣ID")
+ private Integer pfundtaxid = null;
/**
- * 瀹℃牳鐘舵�侊細0鏄湭瀹℃牳
+ * 閮ㄩ棬id
*/
- @ApiModelProperty("瀹℃牳鐘舵�侊細0鏄湭瀹℃牳")
- private Integer checkstatus = null;
-
- /**
- * 閮ㄩ棬缂栧彿
- */
- @ApiModelProperty("閮ㄩ棬缂栧彿")
- private String padepartno = "";
+ @ApiModelProperty("閮ㄩ棬id")
+ private Integer padepartid = null;
/**
* 缁忓姙浜猴紝鏀寔妯＄硦鎼滅储
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java
index fc7c241..64234ab 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java
@@ -36,8 +36,8 @@
List<SpFinancialExpensesFundOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE, @Param("CHECKSTATUS") Integer CHECKSTATUS, @Param("donorname") String donorname);
- List<SpFinancialExpensesFundOut> getExpertfeeList(@Param("PAAPPLYTYPE") Integer PAAPPLYTYPE, @Param("DONORNAME") String DONORNAME, @Param("PACHECKNO") String PACHECKNO, @Param("CHECKSTATUS") Integer CHECKSTATUS, @Param("PADEPARTNO") String PADEPARTNO, @Param("PAUSERNAME") String PAUSERNAME);
+ List<SpFinancialExpensesFundOut> getExpertfeeList(@Param("PAAPPLYTYPE") Integer PAAPPLYTYPE, @Param("PFUNDTAXID") Integer PFUNDTAXID, @Param("DONORNAME") String DONORNAME, @Param("PADEPARTID") Integer PADEPARTID, @Param("PAUSERNAME") String PAUSERNAME);
- Boolean updateFundTaxIdById(@Param("id") Long id,@Param("fundTaxId") Long fundTaxId);
+ Boolean updateFundTaxIdById(@Param("id") Long id, @Param("fundTaxId") Long fundTaxId);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 75ca769..e3126ac 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -708,7 +708,8 @@
@Override
public List<SpFinancialExpensesFundOut> getExpertfeeList(SpSelectExpertfee spSelectExpertfee) {
- return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPacheckno(), spSelectExpertfee.getCheckstatus(), spSelectExpertfee.getPadepartno(), spSelectExpertfee.getPausername());
+ log.info("spSelectExpertfee鐨勫叆鍙備负锛歿}",spSelectExpertfee);
+ return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getPfundtaxid(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPadepartid(), spSelectExpertfee.getPausername());
}
@Override
@@ -934,7 +935,7 @@
String filePath = RuoYiConfig.getDownloadPath() + ajaxResult.get("msg");
List<VExpertfeeDonor> list2 = vExpertfeeDonorMapper.selectVExpertfeeDonorList2(faxId);
- ExcelUtil<VExpertfeeDonor> util2= new ExcelUtil<VExpertfeeDonor>(VExpertfeeDonor.class);
+ ExcelUtil<VExpertfeeDonor> util2 = new ExcelUtil<VExpertfeeDonor>(VExpertfeeDonor.class);
AjaxResult ajaxResult2 = util2.exportExcel(list2, "VExpertfeeDonor");
List<VExpertfeeExpert> list3 = vExpertfeeExpertMapper.selectVExpertfeeExpertListByFaxId(faxId);
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 9d3479d..81d136d 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -271,7 +271,7 @@
<select id="getExpertfeeList" statementType="CALLABLE"
resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
- call SP_SELECT_EXPERTFEE(#{PAAPPLYTYPE,mode=IN,jdbcType=INTEGER},#{DONORNAME,mode=IN,jdbcType=VARCHAR},#{PACHECKNO,mode=IN,jdbcType=VARCHAR},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{PADEPARTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
+ call SP_SELECT_EXPERTFEE(#{PAAPPLYTYPE,mode=IN,jdbcType=INTEGER},#{PFUNDTAXID,mode=IN,jdbcType=INTEGER},#{DONORNAME,mode=IN,jdbcType=VARCHAR},#{PADEPARTID,mode=IN,jdbcType=INTEGER},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
</select>
<update id="updateFundTaxIdById">
@@ -281,4 +281,4 @@
</set>
where id = #{id}
</update>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3