From 88d0598e43a959375187485891a6cf13712ac768 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 27 十月 2026 01:12:49 +0800
Subject: [PATCH] 修改了统计
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java | 81 +++++++++++++
ruoyi-project/src/main/resources/mapper/project/SpstatExpenseMapper.xml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 22 +++
ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml | 3
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 | 32 ++---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatCaseServiceImpl.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpenseReq.java | 8
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java | 76 ++++++++----
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpstatExpenseServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java | 1
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 7 +
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatecomporgan.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java | 37 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java | 12 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCaseReq.java | 6 -
ruoyi-project/src/main/resources/mapper/project/ServiceDonatecomporganMapper.xml | 5
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml | 13 +
21 files changed, 255 insertions(+), 67 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
index 222be9f..c4cfbe3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
@@ -166,6 +166,7 @@
i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
}
if (i) {
+ serviceDonorchargeorgan.setId(null);
QueryWrapper<ServiceDonorchargeorgan> queryWrapper = new QueryWrapper();
queryWrapper.eq("InfoID", serviceDonorchargeorgan.getInfoid())
.eq("OrganNo", serviceDonorchargeorgan.getOrganno());
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 167f43d..ff19deb 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
@@ -11,6 +11,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.SpStatBonus;
import com.ruoyi.project.domain.SpStatBonusReq;
import com.ruoyi.project.domain.vo.TaxMoneyByItemEO;
import com.ruoyi.project.domain.vo.TaxMoneySumEO;
@@ -22,6 +23,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.TemporalAdjusters;
@@ -220,4 +222,24 @@
startPage();
return getDataTable(serviceFunddetailService.getListBySpStatBonus(spStatBonusReq));
}
+
+ /**
+ * 瀵煎嚭缁╂晥濂栭噾缁熻
+ */
+ @ApiOperation("瀵煎嚭缁╂晥濂栭噾缁熻")
+ @Log(title = "缁╂晥缁熻", businessType = BusinessType.EXPORT)
+ @GetMapping("/exportBonus")
+ public AjaxResult exportBonus(SpStatBonusReq spStatBonusReq) {
+ List<SpStatBonus> list = serviceFunddetailService.getListBySpStatBonus(spStatBonusReq);
+ // 閲戦 0.00 涓嶆樉绀�
+ for (SpStatBonus row : list) {
+ row.setAmount(blankZero(row.getAmount()));
+ }
+ ExcelUtil<SpStatBonus> util = new ExcelUtil<SpStatBonus>(SpStatBonus.class);
+ return util.exportExcel(list, "缁╂晥缁熻鏁版嵁");
+ }
+
+ private BigDecimal blankZero(BigDecimal value) {
+ return (value == null || value.compareTo(BigDecimal.ZERO) == 0) ? null : value;
+ }
}
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 713cfb3..acebb14 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
@@ -72,5 +72,17 @@
return getDataTable(spstatCaseService.getListBypower(spStatCaseReq));
}
+ /**
+ * 瀵煎嚭妗堜緥缁熻
+ */
+ @ApiOperation("瀵煎嚭妗堜緥缁熻")
+ @Log(title = "妗堜緥缁熻", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(SpStatCaseReq spStatCaseReq) {
+ List<SpStatCase> list = spstatCaseService.getListBypower(spStatCaseReq);
+ ExcelUtil<SpStatCase> util = new ExcelUtil<SpStatCase>(SpStatCase.class);
+ return util.exportExcel(list, "妗堜緥缁熻鏁版嵁");
+ }
+
}
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
index 2098f7c..1addef2 100644
--- 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
@@ -1,19 +1,26 @@
package com.ruoyi.web.controller.project;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.project.domain.SpStatCaseReq;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.SpStatExpense;
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.GetMapping;
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;
+
+import java.math.BigDecimal;
+import java.util.List;
/**
* 鎶ラ攢缁熻
@@ -31,7 +38,7 @@
SpstatExpenseService spstatExpenseService;
/**
- * 鏌ヨ妗堜緥缁熻
+ * 鏌ヨ璐圭敤缁熻
*/
@ApiOperation("鏌ヨ鎶ラ攢缁熻")
@PostMapping("/spStatExpenselist")
@@ -40,5 +47,29 @@
return getDataTable(spstatExpenseService.getListBySpstatExpense(spStatExpenseReq));
}
+ /**
+ * 瀵煎嚭璐圭敤缁熻
+ */
+ @ApiOperation("瀵煎嚭璐圭敤缁熻")
+ @Log(title = "璐圭敤缁熻", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(SpStatExpenseReq spStatExpenseReq) {
+ List<SpStatExpense> list = spstatExpenseService.getListBySpstatExpense(spStatExpenseReq);
+ // 閲戦淇濈暀 2 浣嶅皬鏁帮紱0.00 涓嶆樉绀猴紙缃┖锛�
+ for (SpStatExpense row : list) {
+ row.setAmount(blankZero(row.getAmount()));
+ row.setExpertfee(blankZero(row.getExpertfee()));
+ row.setEthicalistfee(blankZero(row.getEthicalistfee()));
+ row.setMedicalcost(blankZero(row.getMedicalcost()));
+ row.setOfficecost(blankZero(row.getOfficecost()));
+ row.setReimcost(blankZero(row.getReimcost()));
+ }
+ ExcelUtil<SpStatExpense> util = new ExcelUtil<SpStatExpense>(SpStatExpense.class);
+ return util.exportExcel(list, "璐圭敤缁熻鏁版嵁");
+ }
+
+ private BigDecimal blankZero(BigDecimal value) {
+ return (value == null || value.compareTo(BigDecimal.ZERO) == 0) ? null : value;
+ }
}
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 2ef1529..5f6b7e0 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
@@ -242,6 +242,11 @@
@Excel(name = "绉绘浜烘墍灞炲尯鍩熷悕绉�")
private String donorname;
+ /**
+ * 鍣ㄥ畼鎺掗槦搴忓彿锛堝彇鑷瓧鍏� sys_Organ 鐨� dict_sort锛�
+ */
+ @ApiModelProperty("鍣ㄥ畼鎺掗槦搴忓彿")
+ private Long sort;
}
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 606f64b..90e8a9f 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
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* SP_STAT_BONUS
*
@@ -17,16 +19,10 @@
private static final long serialVersionUID = 1L;
/**
- * 缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害
+ * 缁熻鏈堜唤
*/
- @ApiModelProperty("缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
- @Excel(name = "缁╂晥锛�1銆佹湀搴︺��2瀛ｅ害銆�3骞村害")
- private Integer performancetype;
-
- /**
- * 缁╂晥鏃ユ湡
- */
- @ApiModelProperty("缁╂晥鏃ユ湡")
+ @ApiModelProperty("缁熻鏈堜唤")
+ @Excel(name = "缁熻鏈堜唤", sort = 1)
private String bonusmonth;
/**
@@ -39,27 +35,27 @@
* 閮ㄩ棬鍚嶇О
*/
@ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "涓氬姟缁�", sort = 2)
private String deptName;
/**
* 鏀剁泭浜虹紪鍙�
*/
@ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
private String beneficiaryno;
/**
- * 鏀剁泭浜虹紪鍙�
+ * 鏀剁泭浜哄鍚�
*/
- @ApiModelProperty("鏀剁泭浜�")
- @Excel(name = "鏀剁泭浜�")
+ @ApiModelProperty("鏀剁泭浜哄鍚�")
+ @Excel(name = "涓撹亴浜哄憳", sort = 3)
private String beneficiaryname;
+
/**
- * 鏀剁泭浜虹紪鍙�
+ * 閲戦
*/
- @ApiModelProperty("鐢宠閲戦")
- @Excel(name = "鐢宠閲戦")
- private double amount;
+ @ApiModelProperty("閲戦")
+ @Excel(name = "閲戦", sort = 4, scale = 2)
+ private BigDecimal amount;
}
-
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..b9d1c03 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
@@ -27,6 +27,7 @@
* donationmonth
*/
@ApiModelProperty("donationmonth")
+ @Excel(name = "缁熻鏈堜唤", sort = 1)
private String donationmonth;
/**
@@ -39,6 +40,7 @@
* deptname
*/
@ApiModelProperty("deptname")
+ @Excel(name = "涓氬姟缁�", sort = 2)
private String deptname;
/**
@@ -51,13 +53,90 @@
* reportername
*/
@ApiModelProperty("reportername")
+ @Excel(name = "涓撹亴浜哄憳", sort = 3)
private String reportername;
/**
* casesum
*/
@ApiModelProperty("casesum")
+ @Excel(name = "妗堜緥绱", sort = 4, cellType = Excel.ColumnType.NUMERIC)
private String casesum;
-}
+ /**
+ * 鐜妭 0锛氭綔鍦ㄦ崘鐚�
+ */
+ @ApiModelProperty("娼滃湪鎹愮尞")
+ @Excel(name = "娼滃湪鎹愮尞", sort = 5, cellType = Excel.ColumnType.NUMERIC)
+ private String workflow0;
+ /**
+ * 鐜妭 1锛氬尰瀛﹁瘎浼�
+ */
+ @ApiModelProperty("鍖诲璇勪及")
+ @Excel(name = "鍖诲璇勪及", sort = 6, cellType = Excel.ColumnType.NUMERIC)
+ private String workflow1;
+
+ /**
+ * 鐜妭 2锛氬灞炵‘璁�
+ */
+ @ApiModelProperty("瀹跺睘纭")
+ @Excel(name = "瀹跺睘纭", sort = 7, cellType = Excel.ColumnType.NUMERIC)
+ private String workflow2;
+
+ /**
+ * 鐜妭 3锛氫鸡鐞嗗鏌�
+ */
+ @ApiModelProperty("浼︾悊瀹℃煡")
+ @Excel(name = "浼︾悊瀹℃煡", sort = 8, cellType = Excel.ColumnType.NUMERIC)
+ private String workflow3;
+
+ /**
+ * 鐜妭 4锛氬櫒瀹樺垎閰�
+ */
+ @ApiModelProperty("鍣ㄥ畼鍒嗛厤")
+ @Excel(name = "鍣ㄥ畼鍒嗛厤", sort = 9, cellType = Excel.ColumnType.NUMERIC)
+ private String workflow4;
+
+ /**
+ * 鐜妭 5锛氳幏鍙栬璇�
+ */
+ @ApiModelProperty("鑾峰彇瑙佽瘉")
+ @Excel(name = "鑾峰彇瑙佽瘉", sort = 10, cellType = Excel.ColumnType.NUMERIC)
+ private String workflow5;
+
+ /**
+ * 鐜妭 6锛氭崘鐚畬鎴�
+ */
+ @ApiModelProperty("鎹愮尞瀹屾垚")
+ @Excel(name = "鎹愮尞瀹屾垚", sort = 11, cellType = Excel.ColumnType.NUMERIC)
+ private String workflow6;
+
+ /**
+ * 鐜妭 7锛氬綊妗ｆ挙閿�
+ */
+ @ApiModelProperty("褰掓。鎾ら攢")
+ @Excel(name = "褰掓。鎾ら攢", sort = 12, cellType = Excel.ColumnType.NUMERIC)
+ private String workflow7;
+
+ /**
+ * 鐜妭 8锛氭渚嬪綊妗�
+ */
+ @ApiModelProperty("妗堜緥褰掓。")
+ @Excel(name = "妗堜緥褰掓。", sort = 13, cellType = Excel.ColumnType.NUMERIC)
+ private String workflow8;
+
+ /**
+ * 鐜妭 9锛氭渚嬬粓姝紙椤甸潰宸查殣钘忚鍒楋紝瀵煎嚭涔熶笉杈撳嚭锛�
+ */
+ @ApiModelProperty("妗堜緥缁堟")
+ private String workflow9;
+
+ /**
+ * 缁堟妗堜緥鏁帮紙termination_case=1锛�
+ */
+ @ApiModelProperty("缁堟妗堜緥鏁�")
+ @Excel(name = "缁堟妗堜緥", sort = 14, cellType = Excel.ColumnType.NUMERIC)
+ private String terminationcase;
+
+}
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 73042be..888c686 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
@@ -40,12 +40,6 @@
@ApiModelProperty("pauserno")
private String pausername = "";
- /**
- * pacasestate
- */
- @ApiModelProperty("pacasestate")
- private String pacasestate = "";
-
}
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 66db19d..fd632f9 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
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* SP_STAT_EXPENSE
*
@@ -16,55 +18,79 @@
public class SpStatExpense {
private static final long serialVersionUID = 1L;
-
/**
- * 鏀剁泭浜虹紪鍙�
+ * 缁熻鏈堜唤
*/
- @ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
+ @ApiModelProperty("缁熻鏈堜唤")
+ @Excel(name = "缁熻鏈堜唤", sort = 1)
private String applymonth;
/**
- * 鏀剁泭浜虹紪鍙�
+ * 浜哄憳缂栧彿
*/
- @ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
+ @ApiModelProperty("浜哄憳缂栧彿")
private String userno;
/**
- * 鏀剁泭浜虹紪鍙�
+ * 浜哄憳濮撳悕
*/
- @ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
+ @ApiModelProperty("浜哄憳濮撳悕")
+ @Excel(name = "涓撹亴浜哄憳", sort = 3)
private String username;
/**
- * 鏀剁泭浜虹紪鍙�
+ * 閮ㄩ棬缂栧彿
*/
- @ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
+ @ApiModelProperty("閮ㄩ棬缂栧彿")
private String deptmentno;
/**
- * 鏀剁泭浜虹紪鍙�
+ * 閮ㄩ棬鍚嶇О
*/
- @ApiModelProperty("鏀剁泭浜�")
- @Excel(name = "鏀剁泭浜�")
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "涓氬姟缁�", sort = 2)
private String deptmentName;
/**
- * 鏀剁泭浜虹紪鍙�
+ * 閲戦鍚堣
*/
- @ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
- private String AmountRequested;
+ @ApiModelProperty("閲戦鍚堣")
+ @Excel(name = "鎶ラ攢鎬婚噾棰�", sort = 4, scale = 2)
+ private BigDecimal amount;
/**
- * 鏀剁泭浜虹紪鍙�
+ * 涓撳鍔冲姟璐�
*/
- @ApiModelProperty("鏀剁泭浜虹紪鍙�")
- @Excel(name = "鏀剁泭浜虹紪鍙�")
- private String applyType;
+ @ApiModelProperty("涓撳鍔冲姟璐�")
+ @Excel(name = "涓撳璐�", sort = 5, scale = 2)
+ private BigDecimal expertfee;
+
+ /**
+ * 浼︾悊涓撳璐�
+ */
+ @ApiModelProperty("浼︾悊涓撳璐�")
+ @Excel(name = "浼︾悊涓撳璐�", sort = 6, scale = 2)
+ private BigDecimal ethicalistfee;
+
+ /**
+ * 鍖诲鎴愭湰
+ */
+ @ApiModelProperty("鍖诲鎴愭湰")
+ @Excel(name = "鍖诲鎴愭湰", sort = 7, scale = 2)
+ private BigDecimal medicalcost;
+
+ /**
+ * 鍔炲叕璐�
+ */
+ @ApiModelProperty("鍔炲叕璐�")
+ @Excel(name = "鍔炲叕璐�", sort = 8, scale = 2)
+ private BigDecimal officecost;
+
+ /**
+ * 宸梾璐�
+ */
+ @ApiModelProperty("宸梾璐�")
+ @Excel(name = "宸梾璐�", sort = 9, scale = 2)
+ private BigDecimal reimcost;
}
-
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 dd6f857..4f3f44c 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
@@ -35,13 +35,13 @@
/**
- * pausername
+ * pauserno
*/
- @ApiModelProperty("pausername")
- private String pausername = "";
+ @ApiModelProperty("pauserno")
+ private String pauserno = "";
/**
- * pacasestate
+ * paexpensetype
*/
@ApiModelProperty("paexpensetype")
private String paexpensetype = "";
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 45ca1ad..61a0ec1 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("PAUSERNAME") String PAUSERNAME, @Param("PACASESTATE") String PACASESTATE);
+ List<SpStatCase> getListBypower(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME);
}
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 25ea9f2..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("PAUSERNAME") String PAUSERNAME, @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 7488e4b..d87d18f 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
@@ -505,6 +505,11 @@
@Override
public List<SpStatBonus> getListBySpStatBonus(SpStatBonusReq spStatBonusReq) {
- return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername(), spStatBonusReq.getPabonustype());
+ // PABONUSTYPE 鍦ㄥ瓨鍌ㄨ繃绋嬩腑鏄� INTEGER锛岀┖涓蹭細鎶� Incorrect integer value锛涚┖鍊兼寜 0锛堝叏閮級澶勭悊
+ String bonusType = spStatBonusReq.getPabonustype();
+ if (bonusType == null || bonusType.trim().isEmpty()) {
+ bonusType = "0";
+ }
+ return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername(), bonusType);
}
}
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 f202be9..3aa6738 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.getPausername(), spStatCaseReq.getPacasestate());
+ return spstatCaseMapper.getListBypower(spStatCaseReq.getPabegtime(), spStatCaseReq.getPaendtime(), spStatCaseReq.getPadeptno(), spStatCaseReq.getPausername());
}
}
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 18ca08f..d111a5f 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.getPausername(), spStatExpenseReq.getPaexpensetype());
+ return spstatExpenseMapper.getListBySpstatExpense(spStatExpenseReq.getPabegtime(), spStatExpenseReq.getPaendtime(), spStatExpenseReq.getPadeptno(), spStatExpenseReq.getPauserno(), spStatExpenseReq.getPaexpensetype());
}
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecomporganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecomporganMapper.xml
index a140cc0..8cc779a 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecomporganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecomporganMapper.xml
@@ -34,6 +34,8 @@
<result property="residencecommunityname" column="ResidenceCommunityName"/>
<result property="residencecountycode" column="ResidenceCountyCode"/>
<result property="residencecountyname" column="ResidenceCountyName"/>
+ <!-- 2026-10-23锛氬櫒瀹樻帓闃熷簭鍙� -->
+ <result property="sort" column="sort"/>
<result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
@@ -48,6 +50,7 @@
InfoID,
OrganNo,
OrganName,
+ sort,
transplantstate,
AbandonReason,
TransplantTime,
@@ -140,6 +143,8 @@
concat('%', #{residencecountyname}, '%')
</if>
</where>
+ <!-- 2026-10-23锛氭寜鍣ㄥ畼鎺掗槦搴忓彿鎺掑簭锛堢┖鐨勬帓鏈�鍚庯紝鍐嶆寜涓婚敭鍏滃簳锛� -->
+ order by (sort is null or sort = 0), sort asc, ID asc
</select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index b7325ee..a9cbfc1 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -182,6 +182,8 @@
<if test="isdgf != null ">and isDGF = #{isdgf}</if>
</where>
+ <!-- 2026-10-23锛氭寜鍣ㄥ畼鎺掗槦搴忓彿鎺掑簭锛堢┖鐨勬帓鏈�鍚庯紝鍐嶆寜涓婚敭鍏滃簳锛� -->
+ order by (sort is null or sort = 0), sort asc, ID asc
</select>
<select id="getAllDonateOrgans" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
<include refid="selectServiceDonateorganVo"/>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
index 6c7e370..67b20fe 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
@@ -93,6 +93,8 @@
<if test="isdgf != null and isdgf != ''">and IsDGF = #{isdgf}</if>
<if test="organStartTime != null">and organ_start_time = #{organStartTime}</if>
</where>
+ <!-- 2026-10-23锛氭寜鍣ㄥ畼鎺掗槦搴忓彿鎺掑簭锛堢┖鐨勬帓鏈�鍚庯紝鍐嶆寜涓婚敭鍏滃簳锛� -->
+ order by (sort is null or sort = 0), sort asc, ID asc
</select>
</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
index 81b759d..c960411 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
@@ -4,11 +4,20 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.SpStatBonusMapper">
+ <!-- 鏂� SP 杩斿洖 dept_id / dept_name 涓嬪垝绾垮垪锛岄」鐩湭寮�鍚� mapUnderscoreToCamelCase锛岄渶鏄惧紡鏄犲皠 -->
+ <resultMap id="SpStatBonusResult" type="com.ruoyi.project.domain.SpStatBonus">
+ <result property="bonusmonth" column="bonusmonth"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="deptName" column="dept_name"/>
+ <result property="beneficiaryno" column="BeneficiaryNo"/>
+ <result property="beneficiaryname" column="BeneficiaryName"/>
+ <result property="amount" column="amount"/>
+ </resultMap>
<select id="getListBySpStatBonus" statementType="CALLABLE"
- resultType="com.ruoyi.project.domain.SpStatBonus">
+ resultMap="SpStatBonusResult">
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>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
index 7dabce4..2c83f53 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/SpstatCaseMapper.xml
@@ -7,7 +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},#{PAUSERNAME,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},#{PAUSERNAME,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 7823ed2..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},#{PAUSERNAME,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},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAEXPENSETYPE,mode=IN,jdbcType=VARCHAR})
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3