From ded03f0315e02c13f17b8bf7777c89a5cc73130e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 12:16:38 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java | 7
ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeExpertService.java | 24 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VExpertfeeTotalController.java | 110 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java | 109 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeTotal.java | 65 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java | 27
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VExpertfeeExpertController.java | 110 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeTotalService.java | 24 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 17
ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml | 7
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeTotalServiceImpl.java | 54 +++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeExpertServiceImpl.java | 73 ++++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 3
ruoyi-project/src/main/resources/mapper/project/VExpertfeeTotalMapper.xml | 71 +++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeTotalMapper.java | 27 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 106 ++++-
ruoyi-project/src/main/resources/mapper/project/VExpertfeeExpertMapper.xml | 87 ++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeExpertMapper.java | 27 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java | 14
ruoyi-project/src/main/java/com/ruoyi/project/domain/TestExcelVo.java | 71 +++
23 files changed, 998 insertions(+), 42 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index 897976f..f49a244 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -31,6 +31,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Options;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.transaction.TransactionDefinition;
@@ -2237,4 +2242,16 @@
return AjaxResult.success(dataMap);
}
+
+ /**
+ * 瀵煎嚭涓撳鎶ラ攢璐圭敤姹囨��
+ */
+ @ApiOperation("瀵煎嚭涓撳鎶ラ攢璐圭敤姹囨��")
+ @Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.EXPORT)
+ @GetMapping("/exportFeeSum/{faxId}")
+ public Map<String, Object> exportFeeSum(@PathVariable Integer faxId) {
+ Map<String, Object> map = serviceFundService.exportFeeSum(faxId);
+ return map;
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
index 8cb1ee2..348e725 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
@@ -95,12 +95,9 @@
@ApiOperation("鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�")
@PreAuthorize("@ss.hasPermi('system:fundtax:remove')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/id")
+ @GetMapping("/remove/{id}")
public AjaxResult remove(@PathVariable Long id) {
- ServiceFundtax serviceFundtax = new ServiceFundtax();
- serviceFundtax.setDel_flag(1);
- serviceFundtax.setId(id);
- return toAjax(serviceFundtaxService.updateById(serviceFundtax));
+ return toAjax(serviceFundtaxService.removeById(id));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
index 7f3bae3..f275cf0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
@@ -19,15 +19,14 @@
/**
* 宸梾鎶ラ攢浠樻淇℃伅Controller
- *
+ *
* @author ruoyi
* @date 2023-05-10
*/
@Api("宸梾鎶ラ攢浠樻淇℃伅")
@RestController
@RequestMapping("/project/reimbursementpayee")
-public class ServiceReimbursementpayeeController extends BaseController
-{
+public class ServiceReimbursementpayeeController extends BaseController {
@Autowired
private IServiceReimbursementpayeeService serviceReimbursementpayeeService;
@@ -36,9 +35,8 @@
*/
@ApiOperation("鏌ヨ宸梾鎶ラ攢浠樻淇℃伅鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceReimbursementpayee serviceReimbursementpayee)
- {
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) {
startPage();
List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee);
return getDataTable(list);
@@ -51,8 +49,7 @@
//@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:export')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceReimbursementpayee serviceReimbursementpayee)
- {
+ public AjaxResult export(ServiceReimbursementpayee serviceReimbursementpayee) {
List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee);
ExcelUtil<ServiceReimbursementpayee> util = new ExcelUtil<ServiceReimbursementpayee>(ServiceReimbursementpayee.class);
return util.exportExcel(list, "宸梾鎶ラ攢浠樻淇℃伅鏁版嵁");
@@ -64,8 +61,7 @@
@ApiOperation("鑾峰彇宸梾鎶ラ攢浠樻淇℃伅璇︾粏淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
+ public AjaxResult getInfo(@PathVariable("id") String id) {
return AjaxResult.success(serviceReimbursementpayeeService.getById(id));
}
@@ -77,8 +73,7 @@
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee)
- {
+ public AjaxResult add(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) {
boolean save = serviceReimbursementpayeeService.save(serviceReimbursementpayee);
return AjaxResult.success(serviceReimbursementpayee);
}
@@ -90,9 +85,8 @@
//@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:edit')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.UPDATE)
@PostMapping("/reimbursementpayeeEdit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee) {
return toAjax(serviceReimbursementpayeeService.updateById(serviceReimbursementpayee));
}
@@ -103,8 +97,7 @@
//@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:remove')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
+ public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(serviceReimbursementpayeeService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VExpertfeeExpertController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VExpertfeeExpertController.java
new file mode 100644
index 0000000..e954185
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VExpertfeeExpertController.java
@@ -0,0 +1,110 @@
+package com.ruoyi.web.controller.project;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.VExpertfeeExpert;
+import com.ruoyi.project.service.IVExpertfeeExpertService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * VIEWController
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+@Api("VIEW")
+@RestController
+@RequestMapping("/project/feeexpert")
+public class VExpertfeeExpertController extends BaseController
+{
+ @Autowired
+ private IVExpertfeeExpertService vExpertfeeExpertService;
+
+ /**
+ * 鏌ヨVIEW鍒楄〃
+ */
+ @ApiOperation("鏌ヨVIEW鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('system:expert:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(VExpertfeeExpert vExpertfeeExpert)
+ {
+ startPage();
+ List<VExpertfeeExpert> list = vExpertfeeExpertService.queryList(vExpertfeeExpert);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭VIEW鍒楄〃
+ */
+ @ApiOperation("瀵煎嚭VIEW鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('system:expert:export')")
+ @Log(title = "VIEW", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(VExpertfeeExpert vExpertfeeExpert)
+ {
+ List<VExpertfeeExpert> list = vExpertfeeExpertService.queryList(vExpertfeeExpert);
+ ExcelUtil<VExpertfeeExpert> util = new ExcelUtil<VExpertfeeExpert>(VExpertfeeExpert.class);
+ return util.exportExcel(list, "VIEW鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇VIEW璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇VIEW璇︾粏淇℃伅")
+ @PreAuthorize("@ss.hasPermi('system:expert:query')")
+ @GetMapping(value = "/{fundTaxId}")
+ public AjaxResult getInfo(@PathVariable("fundTaxId") Long fundTaxId)
+ {
+ return AjaxResult.success(vExpertfeeExpertService.getById(fundTaxId));
+ }
+
+ /**
+ * 鏂板VIEW
+ */
+ @ApiOperation("鏂板VIEW")
+ @PreAuthorize("@ss.hasPermi('system:expert:add')")
+ @Log(title = "VIEW", businessType = BusinessType.INSERT)
+ @PostMapping
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody VExpertfeeExpert vExpertfeeExpert)
+ {
+ return toAjax(vExpertfeeExpertService.save(vExpertfeeExpert));
+ }
+
+ /**
+ * 淇敼VIEW
+ */
+ @ApiOperation("淇敼VIEW")
+ @PreAuthorize("@ss.hasPermi('system:expert:edit')")
+ @Log(title = "VIEW", businessType = BusinessType.UPDATE)
+ @PutMapping
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody VExpertfeeExpert vExpertfeeExpert)
+ {
+ return toAjax(vExpertfeeExpertService.updateById(vExpertfeeExpert));
+ }
+
+ /**
+ * 鍒犻櫎VIEW
+ */
+ @ApiOperation("鍒犻櫎VIEW")
+ @PreAuthorize("@ss.hasPermi('system:expert:remove')")
+ @Log(title = "VIEW", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{fundTaxIds}")
+ public AjaxResult remove(@PathVariable Long[] fundTaxIds)
+ {
+ return toAjax(vExpertfeeExpertService.removeByIds(Arrays.asList(fundTaxIds)));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VExpertfeeTotalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VExpertfeeTotalController.java
new file mode 100644
index 0000000..49c9629
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VExpertfeeTotalController.java
@@ -0,0 +1,110 @@
+package com.ruoyi.web.controller.project;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.VExpertfeeTotal;
+import com.ruoyi.project.service.IVExpertfeeTotalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * VIEWController
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+@Api("VIEW")
+@RestController
+@RequestMapping("/project/feetotal")
+public class VExpertfeeTotalController extends BaseController
+{
+ @Autowired
+ private IVExpertfeeTotalService vExpertfeeTotalService;
+
+ /**
+ * 鏌ヨVIEW鍒楄〃
+ */
+ @ApiOperation("鏌ヨVIEW鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('system:total:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(VExpertfeeTotal vExpertfeeTotal)
+ {
+ startPage();
+ List<VExpertfeeTotal> list = vExpertfeeTotalService.queryList(vExpertfeeTotal);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭VIEW鍒楄〃
+ */
+ @ApiOperation("瀵煎嚭VIEW鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('system:total:export')")
+ @Log(title = "VIEW", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(VExpertfeeTotal vExpertfeeTotal)
+ {
+ List<VExpertfeeTotal> list = vExpertfeeTotalService.queryList(vExpertfeeTotal);
+ ExcelUtil<VExpertfeeTotal> util = new ExcelUtil<VExpertfeeTotal>(VExpertfeeTotal.class);
+ return util.exportExcel(list, "VIEW鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇VIEW璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇VIEW璇︾粏淇℃伅")
+ @PreAuthorize("@ss.hasPermi('system:total:query')")
+ @GetMapping(value = "/{fundTaxId}")
+ public AjaxResult getInfo(@PathVariable("fundTaxId") Long fundTaxId)
+ {
+ return AjaxResult.success(vExpertfeeTotalService.getById(fundTaxId));
+ }
+
+ /**
+ * 鏂板VIEW
+ */
+ @ApiOperation("鏂板VIEW")
+ @PreAuthorize("@ss.hasPermi('system:total:add')")
+ @Log(title = "VIEW", businessType = BusinessType.INSERT)
+ @PostMapping
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody VExpertfeeTotal vExpertfeeTotal)
+ {
+ return toAjax(vExpertfeeTotalService.save(vExpertfeeTotal));
+ }
+
+ /**
+ * 淇敼VIEW
+ */
+ @ApiOperation("淇敼VIEW")
+ @PreAuthorize("@ss.hasPermi('system:total:edit')")
+ @Log(title = "VIEW", businessType = BusinessType.UPDATE)
+ @PutMapping
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody VExpertfeeTotal vExpertfeeTotal)
+ {
+ return toAjax(vExpertfeeTotalService.updateById(vExpertfeeTotal));
+ }
+
+ /**
+ * 鍒犻櫎VIEW
+ */
+ @ApiOperation("鍒犻櫎VIEW")
+ @PreAuthorize("@ss.hasPermi('system:total:remove')")
+ @Log(title = "VIEW", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{fundTaxIds}")
+ public AjaxResult remove(@PathVariable Long[] fundTaxIds)
+ {
+ return toAjax(vExpertfeeTotalService.removeByIds(Arrays.asList(fundTaxIds)));
+ }
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
index a352611..e2c21ca 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java
@@ -381,7 +381,7 @@
private Integer performancetype;
/**
- * 涓撳璐圭敤绠楃◣鐢宠涓昏〃ID
+ * 涓撳璐圭敤绠楃◣鐢宠涓昏〃ID,褰撳�间负-1鏃讹紝琛ㄧずfundTaxId涓簄ull
*/
@ApiModelProperty("涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
@Excel(name = "涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
index b6058a4..842f349 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFundtax.java
@@ -112,6 +112,13 @@
private BigDecimal taxamount;
/**
+ * 鎵ｇ◣閲戦
+ */
+ @ApiModelProperty("鎵ｇ◣閲戦")
+ @Excel(name = "鎵ｇ◣閲戦")
+ private BigDecimal taxMoney;
+
+ /**
* 鍖诲鎴愭湰鍚堣
*/
@ApiModelProperty("鍖诲鎴愭湰鍚堣")
@@ -253,6 +260,13 @@
private String updownremark;
/**
+ * 鏉ョ敤璁板綍鎻掑叆鍒嗕韩琛ㄥけ璐�
+ */
+ @ApiModelProperty("鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�")
+ @Excel(name = "鏄惁绠楃◣锛�0鏈畻绋庯紝1宸茬畻绋�")
+ private Integer istax;
+
+ /**
* serviceFunds闆嗗悎
*/
@ApiModelProperty("serviceFunds闆嗗悎")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/TestExcelVo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/TestExcelVo.java
new file mode 100644
index 0000000..6ce9152
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/TestExcelVo.java
@@ -0,0 +1,71 @@
+package com.ruoyi.project.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鎹愮尞闄勪欢瀵硅薄 service_donateannex
+ *
+ * @author ruoyi
+ * @date 2021-11-11
+ */
+@Data
+@ApiModel("TestExcelVo")
+public class TestExcelVo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呭鍚�")
+ private String donorno;
+
+ /**
+ * 闄勪欢鍚嶇О
+ */
+ @ApiModelProperty("闄勪欢鍚嶇О")
+ @Excel(name = "涓氬姟缁�")
+ private String annexname;
+
+ /**
+ * 闄勪欢缂栧彿
+ */
+ @ApiModelProperty("闄勪欢缂栧彿")
+ @Excel(name = "鎹愮尞鑰呭尰瀛︽敮鎸佹垚鏈�")
+ private String annexno;
+
+ /**
+ * 闄勪欢璺緞
+ */
+ @ApiModelProperty("閬椾綋淇鍙婂杽鍚庢垚鏈�")
+ @Excel(name = "閬椾綋淇鍙婂杽鍚庢垚鏈�")
+ private String annexurl;
+
+ /**
+ * 闄勪欢绫诲瀷
+ */
+ @ApiModelProperty("鍣ㄥ畼鑾峰彇鎵嬫湳鎴愭湰")
+ @Excel(name = "鎹愮尞鑰呭尰瀛︽敮鍣ㄥ畼鑾峰彇鎵嬫湳鎴愭湰鎸佹垚鏈�")
+ private String annexfilestype;
+
+ /**
+ * 闄勪欢绫诲瀷
+ */
+ @ApiModelProperty("鍣ㄥ畼鍖诲鏀寔鎴愭湰")
+ @Excel(name = "鍣ㄥ畼鍖诲鏀寔鎴愭湰")
+ private String delFlag;
+ /**
+ * 闄勪欢绫诲瀷
+ */
+ @ApiModelProperty("妗堜緥涓撳璐归噾棰濓紙鍏冿級")
+ @Excel(name = "妗堜緥涓撳璐归噾棰濓紙鍏冿級")
+ private String delFlag2;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java
new file mode 100644
index 0000000..2b0b839
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeExpert.java
@@ -0,0 +1,109 @@
+package com.ruoyi.project.domain;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * VIEW瀵硅薄 v_expertfee_expert
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+@Data
+@ApiModel("VIEW")
+public class VExpertfeeExpert {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓撳璐圭敤绠楃◣鐢宠涓昏〃ID
+ */
+ @ApiModelProperty("涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
+// @Excel(name = "涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
+ private Long fundTaxId;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍙楃泭浜虹被鍨�")
+ private String beneficiarytype;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+// @Excel(name = "涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
+ private Long belong;
+
+ /**
+ * 鏀剁泭浜哄鍚�(瀹跺睘銆佷笓瀹躲�佹満鏋�)
+ */
+ @ApiModelProperty("鏀剁泭浜哄鍚�(瀹跺睘銆佷笓瀹躲�佹満鏋�)")
+ @Excel(name = "鏀剁泭浜哄鍚�(瀹跺睘銆佷笓瀹躲�佹満鏋�)")
+ private String beneficiaryname;
+
+ /**
+ * 璇佷欢鍙风爜
+ */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ @Excel(name = "璇佷欢鍙风爜")
+ private String idcardno;
+
+ /**
+ * 寮�鎴烽摱琛�
+ */
+ @ApiModelProperty("寮�鎴烽摱琛�")
+ @Excel(name = "寮�鎴烽摱琛�")
+ private String depositbank;
+
+ /**
+ * 鍗″彿
+ */
+ @ApiModelProperty("鍗″彿")
+ @Excel(name = "鍗″彿")
+ private String bankcardno;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍗″彿")
+ private BigDecimal pretaxamount;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍗″彿")
+ private BigDecimal taxamount;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍗″彿")
+ private BigDecimal taxedamount;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍗″彿")
+ private String donorname;
+
+ /**
+ * $column.columnComment
+ */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍗″彿")
+ private String unitname;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeTotal.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeTotal.java
new file mode 100644
index 0000000..44c46e6
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeTotal.java
@@ -0,0 +1,65 @@
+package com.ruoyi.project.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * VIEW瀵硅薄 v_expertfee_total
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+@Data
+@ApiModel("VIEW")
+public class VExpertfeeTotal
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓撳璐圭敤绠楃◣鐢宠涓昏〃ID */
+ @ApiModelProperty("涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
+// @Excel(name = "涓撳璐圭敤绠楃◣鐢宠涓昏〃ID")
+ private Long fundTaxId;
+
+ /** 閮ㄩ棬鍚嶇О */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptmentname;
+
+ /** 閮ㄩ棬鍚嶇О */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+// @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptmentno;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鎹愮尞鑰呭尰瀛︽敮鎸佹垚鏈�")
+ private BigDecimal donormedicalcost;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "閬椾綋淇鍙婂杽鍚庢垚鏈�")
+ private BigDecimal donorbodycost;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍣ㄥ畼鑾峰彇鎵嬫湳鎴愭湰")
+ private BigDecimal organgaincost;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍣ㄥ畼鍖诲鏀寔鎴愭湰")
+ private BigDecimal organmedicalcost;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍚堣")
+ private BigDecimal donorcost;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeExpertMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeExpertMapper.java
new file mode 100644
index 0000000..910a11b
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeExpertMapper.java
@@ -0,0 +1,27 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.VExpertfeeExpert;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * VIEWMapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+@Mapper
+public interface VExpertfeeExpertMapper extends BaseMapper<VExpertfeeExpert> {
+ /**
+ * 鏌ヨVIEW鍒楄〃
+ *
+ * @param vExpertfeeExpert VIEW
+ * @return VIEW闆嗗悎
+ */
+ public List<VExpertfeeExpert> selectVExpertfeeExpertList(VExpertfeeExpert vExpertfeeExpert);
+
+ public List<VExpertfeeExpert> selectVExpertfeeExpertListByFaxId(Integer faxId);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeTotalMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeTotalMapper.java
new file mode 100644
index 0000000..0f2b58a
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeTotalMapper.java
@@ -0,0 +1,27 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.VExpertfeeTotal;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * VIEWMapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+@Mapper
+public interface VExpertfeeTotalMapper extends BaseMapper<VExpertfeeTotal> {
+ /**
+ * 鏌ヨVIEW鍒楄〃
+ *
+ * @param vExpertfeeTotal VIEW
+ * @return VIEW闆嗗悎
+ */
+ public List<VExpertfeeTotal> selectVExpertfeeTotalList(VExpertfeeTotal vExpertfeeTotal);
+
+ public List<VExpertfeeTotal> selectVExpertfeeTotalListByTaxId(Integer taxId);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
index ce3201d..aa1f171 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java
@@ -70,4 +70,7 @@
Map<String, List<ServiceFunddetailExcel>> totaltax(TotalTaxVO totalTaxVO);
+ Map<String, Object> exportFeeSum(Integer faxId);
+
+
}
\ No newline at end of file
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeExpertService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeExpertService.java
new file mode 100644
index 0000000..2841823
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeExpertService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.VExpertfeeExpert;
+
+import java.util.List;
+
+/**
+ * VIEWService鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+public interface IVExpertfeeExpertService extends IService<VExpertfeeExpert>
+{
+
+ /**
+ * 鏌ヨVIEW鍒楄〃
+ *
+ * @param vExpertfeeExpert VIEW
+ * @return VIEW闆嗗悎
+ */
+ public List<VExpertfeeExpert> queryList(VExpertfeeExpert vExpertfeeExpert);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeTotalService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeTotalService.java
new file mode 100644
index 0000000..0282a6b
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeTotalService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.VExpertfeeTotal;
+
+import java.util.List;
+
+/**
+ * VIEWService鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+public interface IVExpertfeeTotalService extends IService<VExpertfeeTotal>
+{
+
+ /**
+ * 鏌ヨVIEW鍒楄〃
+ *
+ * @param vExpertfeeTotal VIEW
+ * @return VIEW闆嗗悎
+ */
+ public List<VExpertfeeTotal> queryList(VExpertfeeTotal vExpertfeeTotal);
+}
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 1734a45..f115723 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
@@ -1,40 +1,40 @@
package com.ruoyi.project.service.impl;
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.annotation.NotRepeatCommit;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.ChineseUtils;
import com.ruoyi.common.utils.HttpClientKit;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
import com.ruoyi.project.mapper.*;
-import com.ruoyi.project.service.IServiceFundSharedService;
-import com.ruoyi.project.service.IServiceFunddetailService;
-import com.ruoyi.project.service.IServiceFunddetailSharedService;
+import com.ruoyi.project.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFColor;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.service.IServiceFundService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 璐圭敤鐢宠涓籗ervice涓氬姟灞傚鐞�
@@ -71,6 +71,12 @@
@Autowired
private IServiceFunddetailService serviceFunddetailService;
+
+ @Autowired
+ private VExpertfeeExpertMapper vExpertfeeExpertMapper;
+
+ @Autowired
+ private VExpertfeeTotalMapper vExpertfeeTotalMapper;
/**
@@ -906,6 +912,33 @@
}
}
+ @Override
+ public Map<String, Object> exportFeeSum(Integer faxId) {
+ List<VExpertfeeTotal> list = vExpertfeeTotalMapper.selectVExpertfeeTotalListByTaxId(faxId);
+ ExcelUtil<VExpertfeeTotal> util = new ExcelUtil<VExpertfeeTotal>(VExpertfeeTotal.class);
+ AjaxResult ajaxResult = util.exportExcel(list, "vExpertfeeTotal");
+ String filePath = RuoYiConfig.getDownloadPath() + ajaxResult.get("msg");
+
+ List<VExpertfeeExpert> list2 = vExpertfeeExpertMapper.selectVExpertfeeExpertListByFaxId(faxId);
+ ExcelUtil<VExpertfeeExpert> util2 = new ExcelUtil<VExpertfeeExpert>(VExpertfeeExpert.class);
+ AjaxResult ajaxResult1 = util2.exportExcel(list2, "vExpertfeeExpert");
+
+ List<String> list1 = new ArrayList<>();
+ list1.add(ajaxResult.get("msg").toString());
+ list1.add(ajaxResult1.get("msg").toString());
+
+
+ String name = "涓撳璐规眹鎬诲崟" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xlsx";
+ mergeExcel(list1, RuoYiConfig.getDownloadPath() + name);
+ for (String path : list1) {
+ new File(RuoYiConfig.getDownloadPath() + path).delete();
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name );
+ map.put("downloadName", name);
+ return map;
+ }
+
int uploadOAFileAndUpdateDb(ServiceFunddetailShared remShare) {
//涓婁紶OA鏂囦欢
@@ -1097,4 +1130,41 @@
return id;
}
+ public void mergeExcel(List<String> files, String outputFile) {
+ try {
+ Workbook resultWorkbook = new XSSFWorkbook();
+ for (String file : files) {
+ InputStream is1 = new FileInputStream(RuoYiConfig.getDownloadPath() + file);
+ Workbook workbook1 = new XSSFWorkbook(is1);
+ Sheet sheet1 = workbook1.getSheetAt(0);
+ // 澶嶅埗绗竴涓枃浠剁殑Sheet
+ Sheet newSheet1 = resultWorkbook.createSheet(file.substring(0, file.indexOf(".")));
+ for (Row row : sheet1) {
+ Row newRow = newSheet1.createRow(row.getRowNum());
+ int columns = row.getLastCellNum();
+ for (int i = 0; i < columns; i++) {
+ newSheet1.setColumnWidth(i, 5000);
+ Cell cell = row.getCell(i);
+ Cell newCell = newRow.createCell(cell.getColumnIndex());
+ newCell.setCellValue(cell.getStringCellValue());
+ // 鍒涘缓鍗曞厓鏍兼牱寮�
+ CellStyle style = resultWorkbook.createCellStyle();
+ style.setAlignment(HorizontalAlignment.CENTER); // 姘村钩灞呬腑
+ style.setVerticalAlignment(VerticalAlignment.CENTER); // 鍨傜洿灞呬腑
+ if (row.getRowNum() == 0) {
+ // 璁剧疆绗竴琛岃儗鏅壊
+ style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+ style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+ }
+
+ newCell.setCellStyle(style);
+ }
+ }
+ }
+ FileOutputStream out = new FileOutputStream(outputFile);
+ resultWorkbook.write(out);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
index bda8b14..e34b7e8 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
@@ -81,6 +81,9 @@
if (serviceFundtax.getTaxamount() != null) {
wrappers.eq(ServiceFundtax::getTaxamount, serviceFundtax.getTaxamount());
}
+ if (serviceFundtax.getIstax() != null) {
+ wrappers.eq(ServiceFundtax::getIstax, serviceFundtax.getIstax());
+ }
if (serviceFundtax.getMedicalcost() != null) {
wrappers.eq(ServiceFundtax::getMedicalcost, serviceFundtax.getMedicalcost());
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeExpertServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeExpertServiceImpl.java
new file mode 100644
index 0000000..c5bf742
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeExpertServiceImpl.java
@@ -0,0 +1,73 @@
+package com.ruoyi.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.VExpertfeeExpert;
+import com.ruoyi.project.mapper.VExpertfeeExpertMapper;
+import com.ruoyi.project.service.IVExpertfeeExpertService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * VIEWService涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+@Service
+public class VExpertfeeExpertServiceImpl extends ServiceImpl<VExpertfeeExpertMapper, VExpertfeeExpert> implements IVExpertfeeExpertService
+{
+
+
+ /**
+ * 鏌ヨVIEW鍒楄〃
+ *
+ * @param vExpertfeeExpert VIEW
+ * @return VIEW
+ */
+ @Override
+ public List<VExpertfeeExpert> queryList(VExpertfeeExpert vExpertfeeExpert) {
+ LambdaQueryWrapper<VExpertfeeExpert> wrappers = Wrappers.lambdaQuery();
+ if (vExpertfeeExpert.getFundTaxId() != null){
+ wrappers.eq(VExpertfeeExpert::getFundTaxId ,vExpertfeeExpert.getFundTaxId());
+ }
+ if (vExpertfeeExpert.getBeneficiarytype() != null){
+ wrappers.eq(VExpertfeeExpert::getBeneficiarytype ,vExpertfeeExpert.getBeneficiarytype());
+ }
+ if (vExpertfeeExpert.getBelong() != null){
+ wrappers.eq(VExpertfeeExpert::getBelong ,vExpertfeeExpert.getBelong());
+ }
+ if (StringUtils.isNotBlank(vExpertfeeExpert.getBeneficiaryname())){
+ wrappers.like(VExpertfeeExpert::getBeneficiaryname ,vExpertfeeExpert.getBeneficiaryname());
+ }
+ if (StringUtils.isNotBlank(vExpertfeeExpert.getIdcardno())){
+ wrappers.eq(VExpertfeeExpert::getIdcardno ,vExpertfeeExpert.getIdcardno());
+ }
+ if (StringUtils.isNotBlank(vExpertfeeExpert.getDepositbank())){
+ wrappers.eq(VExpertfeeExpert::getDepositbank ,vExpertfeeExpert.getDepositbank());
+ }
+ if (StringUtils.isNotBlank(vExpertfeeExpert.getBankcardno())){
+ wrappers.eq(VExpertfeeExpert::getBankcardno ,vExpertfeeExpert.getBankcardno());
+ }
+ if (vExpertfeeExpert.getPretaxamount() != null){
+ wrappers.eq(VExpertfeeExpert::getPretaxamount ,vExpertfeeExpert.getPretaxamount());
+ }
+ if (vExpertfeeExpert.getTaxamount() != null){
+ wrappers.eq(VExpertfeeExpert::getTaxamount ,vExpertfeeExpert.getTaxamount());
+ }
+ if (vExpertfeeExpert.getTaxedamount() != null){
+ wrappers.eq(VExpertfeeExpert::getTaxedamount ,vExpertfeeExpert.getTaxedamount());
+ }
+ if (StringUtils.isNotBlank(vExpertfeeExpert.getDonorname())){
+ wrappers.like(VExpertfeeExpert::getDonorname ,vExpertfeeExpert.getDonorname());
+ }
+ if (StringUtils.isNotBlank(vExpertfeeExpert.getUnitname())){
+ wrappers.like(VExpertfeeExpert::getUnitname ,vExpertfeeExpert.getUnitname());
+ }
+ return this.list(wrappers);
+ }
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeTotalServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeTotalServiceImpl.java
new file mode 100644
index 0000000..7bd9f10
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeTotalServiceImpl.java
@@ -0,0 +1,54 @@
+package com.ruoyi.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.VExpertfeeTotal;
+import com.ruoyi.project.mapper.VExpertfeeTotalMapper;
+import com.ruoyi.project.service.IVExpertfeeTotalService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * VIEWService涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+@Service
+public class VExpertfeeTotalServiceImpl extends ServiceImpl<VExpertfeeTotalMapper, VExpertfeeTotal> implements IVExpertfeeTotalService {
+
+
+ /**
+ * 鏌ヨVIEW鍒楄〃
+ *
+ * @param vExpertfeeTotal VIEW
+ * @return VIEW
+ */
+ @Override
+ public List<VExpertfeeTotal> queryList(VExpertfeeTotal vExpertfeeTotal) {
+ LambdaQueryWrapper<VExpertfeeTotal> wrappers = Wrappers.lambdaQuery();
+ if (vExpertfeeTotal.getFundTaxId() != null) {
+ wrappers.eq(VExpertfeeTotal::getFundTaxId, vExpertfeeTotal.getFundTaxId());
+ }
+ if (StringUtils.isNotBlank(vExpertfeeTotal.getDeptmentname())) {
+ wrappers.like(VExpertfeeTotal::getDeptmentname, vExpertfeeTotal.getDeptmentname());
+ }
+ if (vExpertfeeTotal.getDonormedicalcost() != null) {
+ wrappers.eq(VExpertfeeTotal::getDonormedicalcost, vExpertfeeTotal.getDonormedicalcost());
+ }
+ if (vExpertfeeTotal.getDonorbodycost() != null) {
+ wrappers.eq(VExpertfeeTotal::getDonorbodycost, vExpertfeeTotal.getDonorbodycost());
+ }
+ if (vExpertfeeTotal.getOrgangaincost() != null) {
+ wrappers.eq(VExpertfeeTotal::getOrgangaincost, vExpertfeeTotal.getOrgangaincost());
+ }
+ if (vExpertfeeTotal.getOrganmedicalcost() != null) {
+ wrappers.eq(VExpertfeeTotal::getOrganmedicalcost, vExpertfeeTotal.getOrganmedicalcost());
+ }
+ return this.list(wrappers);
+ }
+
+}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 8ff32ae..f59f571 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -151,6 +151,8 @@
<if test="infoid != null ">and InfoID = #{infoid}</if>
<if test="donorno != null and donorno != '' ">and DonorNo = #{donorno}</if>
<if test="jxrq != null ">and jxrq = #{jxrq}</if>
+ <if test="fundTaxId=-1 ">and fund_tax_id = null</if>
+ <if test="fundTaxId!= null and fundTaxId!= -1 ">and fund_tax_id = #{fundTaxId}</if>
</select>
<select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
index 7648ac3..b607e20 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundtaxMapper.xml
@@ -35,7 +35,7 @@
<result property="officedirector" column="OfficeDirector"/>
<result property="financedirector" column="FinanceDirector"/>
<result property="financechecher" column="FinanceChecher"/>
- <result property="delFlag" column="del_flag"/>
+ <result property="del_flag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -43,6 +43,8 @@
<result property="uploadflag" column="uploadflag"/>
<result property="uploadtime" column="uploadtime"/>
<result property="updownremark" column="updownremark"/>
+ <result property="istax" column="istax"/>
+ <result property="taxMoney" column="tax_money"/>
</resultMap>
<sql id="selectServiceFundtaxVo">
@@ -83,6 +85,8 @@
update_time,
uploadflag,
uploadtime,
+ tax_money,
+ istax,
updownremark
from service_fundtax
</sql>
@@ -104,6 +108,7 @@
'%')
</if>
<if test="pretaxamount != null ">and Pretaxamount = #{pretaxamount}</if>
+ <if test="istax != null ">and istax = #{istax}</if>
<if test="taxedamount != null ">and TaxedAmount = #{taxedamount}</if>
<if test="taxamount != null ">and TaxAmount = #{taxamount}</if>
<if test="medicalcost != null ">and MedicalCost = #{medicalcost}</if>
diff --git a/ruoyi-project/src/main/resources/mapper/project/VExpertfeeExpertMapper.xml b/ruoyi-project/src/main/resources/mapper/project/VExpertfeeExpertMapper.xml
new file mode 100644
index 0000000..a41059a
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/VExpertfeeExpertMapper.xml
@@ -0,0 +1,87 @@
+<?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.VExpertfeeExpertMapper">
+
+ <resultMap type="com.ruoyi.project.domain.VExpertfeeExpert" id="VExpertfeeExpertResult">
+ <result property="fundTaxId" column="fund_tax_id"/>
+ <result property="beneficiarytype" column="BeneficiaryType"/>
+ <result property="belong" column="Belong"/>
+ <result property="beneficiaryname" column="BeneficiaryName"/>
+ <result property="idcardno" column="IDCardNo"/>
+ <result property="depositbank" column="DepositBank"/>
+ <result property="bankcardno" column="BankCardNo"/>
+ <result property="pretaxamount" column="PretaxAmount"/>
+ <result property="taxamount" column="TaxAmount"/>
+ <result property="taxedamount" column="TaxedAmount"/>
+ <result property="donorname" column="DonorName"/>
+ <result property="unitname" column="UnitName"/>
+ </resultMap>
+
+ <sql id="selectVExpertfeeExpertVo">
+ select fund_tax_id,
+ BeneficiaryType,
+ Belong,
+ BeneficiaryName,
+ IDCardNo,
+ DepositBank,
+ BankCardNo,
+ PretaxAmount,
+ TaxAmount,
+ TaxedAmount,
+ DonorName,
+ UnitName
+ from v_expertfee_expert
+ </sql>
+
+ <select id="selectVExpertfeeExpertList" parameterType="com.ruoyi.project.domain.VExpertfeeExpert"
+ resultMap="VExpertfeeExpertResult">
+ <include refid="selectVExpertfeeExpertVo"/>
+ <where>
+ <if test="fundTaxId != null ">and fund_tax_id = #{fundTaxId}</if>
+ <if test="beneficiarytype != null ">and BeneficiaryType = #{beneficiarytype}</if>
+ <if test="belong != null ">and Belong = #{belong}</if>
+ <if test="beneficiaryname != null and beneficiaryname != ''">and BeneficiaryName like concat('%',
+ #{beneficiaryname}, '%')
+ </if>
+ <if test="idcardno != null and idcardno != ''">and IDCardNo = #{idcardno}</if>
+ <if test="depositbank != null and depositbank != ''">and DepositBank = #{depositbank}</if>
+ <if test="bankcardno != null and bankcardno != ''">and BankCardNo = #{bankcardno}</if>
+ <if test="pretaxamount != null ">and PretaxAmount = #{pretaxamount}</if>
+ <if test="taxamount != null ">and TaxAmount = #{taxamount}</if>
+ <if test="taxedamount != null ">and TaxedAmount = #{taxedamount}</if>
+ <if test="donorname != null and donorname != ''">and DonorName like concat('%', #{donorname}, '%')</if>
+ <if test="unitname != null and unitname != ''">and UnitName like concat('%', #{unitname}, '%')</if>
+ </where>
+ </select>
+
+ <select id="selectVExpertfeeExpertListByFaxId" parameterType="Integer" resultMap="VExpertfeeExpertResult">
+ SELECT beneficiarytype,
+ beneficiaryname,
+ idcardno,
+ depositbank,
+ bankcardno,
+ pretaxamount,
+ taxamount,
+ taxedamount,
+ donorname,
+ unitname
+ FROM v_expertfee_expert
+ where fund_tax_id = #{taxId}
+ UNION
+ SELECT null as beneficiarytype,
+ "鍚堣" as beneficiaryname,
+ null as idcardno,
+ null as depositbank,
+ null as bankcardno,
+ SUM(pretaxamount) as pretaxamount,
+ SUM(taxamount) as taxamount,
+ SUM(taxedamount) as taxedamount,
+ null as donorname,
+ null as unitname
+ FROM v_expertfee_expert
+ where fund_tax_id = #{taxId}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/VExpertfeeTotalMapper.xml b/ruoyi-project/src/main/resources/mapper/project/VExpertfeeTotalMapper.xml
new file mode 100644
index 0000000..189298d
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/VExpertfeeTotalMapper.xml
@@ -0,0 +1,71 @@
+<?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.VExpertfeeTotalMapper">
+
+ <resultMap type="com.ruoyi.project.domain.VExpertfeeTotal" id="VExpertfeeTotalResult">
+ <result property="fundTaxId" column="fund_tax_id"/>
+ <result property="deptmentno" column="DeptmentNo"/>
+ <result property="deptmentname" column="DeptmentName"/>
+ <result property="donormedicalcost" column="DonorMedicalCost"/>
+ <result property="donorbodycost" column="DonorBodyCost"/>
+ <result property="organgaincost" column="OrganGainCost"/>
+ <result property="donorcost" column="DonorCost"/>
+ <result property="organmedicalcost" column="OrganMedicalCost"/>
+ </resultMap>
+
+ <sql id="selectVExpertfeeTotalVo">
+ select fund_tax_id,
+ DeptmentName,
+ DonorMedicalCost,
+ DonorBodyCost,
+ OrganGainCost,
+ DonorCost,
+ OrganMedicalCost
+ from v_expertfee_total
+ </sql>
+
+ <select id="selectVExpertfeeTotalList" parameterType="com.ruoyi.project.domain.VExpertfeeTotal"
+ resultMap="VExpertfeeTotalResult">
+ <include refid="selectVExpertfeeTotalVo"/>
+ <where>
+ <if test="fundTaxId != null ">and fund_tax_id = #{fundTaxId}</if>
+ <if test="deptmentname != null and deptmentname != ''">and DeptmentName like concat('%', #{deptmentname},
+ '%')
+ </if>
+ <if test="infoid != null ">and InfoID = #{infoid}</if>
+ <if test="donorname != null and donorname != ''">and DonorName like concat('%', #{donorname}, '%')</if>
+ <if test="donormedicalcost != null ">and DonorMedicalCost = #{donormedicalcost}</if>
+ <if test="donorbodycost != null ">and DonorBodyCost = #{donorbodycost}</if>
+ <if test="organgaincost != null ">and OrganGainCost = #{organgaincost}</if>
+ <if test="organmedicalcost != null ">and OrganMedicalCost = #{organmedicalcost}</if>
+ </where>
+ </select>
+
+ <select id="selectVExpertfeeTotalListByTaxId" parameterType="Integer"
+ resultMap="VExpertfeeTotalResult">
+ SELECT fund_tax_id,
+ DeptmentNo,
+ DeptmentName,
+ DonorMedicalCost,
+ DonorBodyCost,
+ OrganGainCost,
+ OrganMedicalCost,
+ DonorCost
+ FROM v_expertfee_total
+ where fund_tax_id = #{taxId}
+ UNION
+ SELECT null as fund_tax_id,
+ null as DeptmentNo,
+ '鍚堣' as DeptmentName,
+ SUM(donormedicalcost) as DonorMedicalCost,
+ SUM(donorbodycost) as DonorBodyCost,
+ SUM(organgaincost) as OrganGainCost,
+ SUM(organmedicalcost) as OrganMedicalCost,
+ SUM(DonorCost) as DonorCost
+ FROM v_expertfee_total
+ where fund_tax_id = #{taxId}
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3