From 532ce3e0c3c899699ce67b70f1a60bf434d6a32d Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 22 四月 2023 10:47:16 +0800
Subject: [PATCH] yxh
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 7
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementdetailSharedService.java | 23 ++
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml | 90 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java | 116 ++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java | 5
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java | 191 +++++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementdetailSharedMapper.java | 23 ++
ruoyi-admin/src/main/resources/application.yml | 16
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java | 136 ++++++++++++
12 files changed, 594 insertions(+), 24 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index b2726d0..5fe433b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -283,11 +283,10 @@
remShare.setDonorbank(serviceReimbursement.getDonorbank());
remShare.setDonorbankcard(serviceReimbursement.getDonorbankcard());
remShare.setDonorremark(serviceReimbursement.getDonorremark());
- remShare.setDonorpayee(serviceReimbursement.getDonorpayee());
- //nTemp = serviceReimbursement.getDonoramount();
- //if(nTemp == null) nTemp = 0.0;
- remShare.setDonoramount(serviceReimbursement.getDonoramount());
+ nTemp = serviceReimbursement.getDonoramount();
+ if(nTemp == null) nTemp = 0.0;
+ remShare.setDonoramount(nTemp);
remShare.setDonorrelatives(serviceReimbursement.getDonorrelatives());
//remShare.setOaid(serviceReimbursement.getOaid());
//remShare.setDonorno(serviceReimbursement.getDonorno());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java
new file mode 100644
index 0000000..d9a3a17
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java
@@ -0,0 +1,116 @@
+package com.ruoyi.project.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+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.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+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.enums.BusinessType;
+import com.ruoyi.project.domain.ServiceReimbursementdetailShared;
+import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 鎶ラ攢鐢宠鏄庣粏Controller
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Api("鎶ラ攢鐢宠鏄庣粏")
+@RestController
+@RequestMapping("/project/reimbursementdetailshared")
+public class ServiceReimbursementdetailSharedController extends BaseController
+{
+ @Autowired
+ private IServiceReimbursementdetailSharedService serviceReimbursementdetailSharedService;
+
+ /**
+ * 鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃
+ */
+ @ApiOperation("鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ServiceReimbursementdetailShared serviceReimbursementdetailShared)
+ {
+ startPage();
+ List<ServiceReimbursementdetailShared> list = serviceReimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎶ラ攢鐢宠鏄庣粏鍒楄〃
+ */
+ @ApiOperation("瀵煎嚭鎶ラ攢鐢宠鏄庣粏鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:export')")
+ @Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(ServiceReimbursementdetailShared serviceReimbursementdetailShared)
+ {
+ List<ServiceReimbursementdetailShared> list = serviceReimbursementdetailSharedService.queryList(serviceReimbursementdetailShared);
+ ExcelUtil<ServiceReimbursementdetailShared> util = new ExcelUtil<ServiceReimbursementdetailShared>(ServiceReimbursementdetailShared.class);
+ return util.exportExcel(list, "鎶ラ攢鐢宠鏄庣粏鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鎶ラ攢鐢宠鏄庣粏璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇鎶ラ攢鐢宠鏄庣粏璇︾粏淇℃伅")
+ @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return AjaxResult.success(serviceReimbursementdetailSharedService.getById(id));
+ }
+
+ /**
+ * 鏂板鎶ラ攢鐢宠鏄庣粏
+ */
+ @ApiOperation("鏂板鎶ラ攢鐢宠鏄庣粏")
+ @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:add')")
+ @Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.INSERT)
+ @PostMapping
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody ServiceReimbursementdetailShared serviceReimbursementdetailShared)
+ {
+ return toAjax(serviceReimbursementdetailSharedService.save(serviceReimbursementdetailShared));
+ }
+
+ /**
+ * 淇敼鎶ラ攢鐢宠鏄庣粏
+ */
+ @ApiOperation("淇敼鎶ラ攢鐢宠鏄庣粏")
+ @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:edit')")
+ @Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
+ @PutMapping
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceReimbursementdetailShared serviceReimbursementdetailShared)
+ {
+ return toAjax(serviceReimbursementdetailSharedService.updateById(serviceReimbursementdetailShared));
+ }
+
+ /**
+ * 鍒犻櫎鎶ラ攢鐢宠鏄庣粏
+ */
+ @ApiOperation("鍒犻櫎鎶ラ攢鐢宠鏄庣粏")
+ @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:remove')")
+ @Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(serviceReimbursementdetailSharedService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f9f74c3..4440bec 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -10,9 +10,9 @@
demoEnabled: true
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
#寮�鍙戠幆澧�
- #profile: D:/YYJQ/OPO/WEB/Upload
+ profile: D:/YYJQ/OPO/WEB/Upload
#鍖婚櫌鐜
- profile: E:/YYJQ/OPO/WEB/Upload
+ #profile: E:/YYJQ/OPO/WEB/Upload
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁扮粍璁＄畻 char 瀛楃楠岃瘉
@@ -69,14 +69,14 @@
# redis 閰嶇疆
redis:
# 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細鍖婚櫌鐜
- host: 129.88.242.37
- password: jqserver
- port: 6379
+ #host: 129.88.242.37
+ #password: jqserver
+ #port: 6379
# 鍦板潃銆佸瘑鐮併�佺鍙ｏ紙榛樿涓�6379锛夛細寮�鍙戠幆澧�
- #host: 116.62.18.175
- #password: Smartor
- #port: 6020
+ host: 116.62.18.175
+ password: Smartor
+ port: 6020
# 鏁版嵁搴撶储寮�
database: 0
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
index 306348c..b13c962 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursement.java
@@ -9,7 +9,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -221,12 +220,10 @@
private String donorremark;
@ApiModelProperty("鎹愮尞瀹跺睘璐圭敤閲戦")
- private BigDecimal donoramount;
+ private Double donoramount;
@ApiModelProperty("鎹愮尞瀹跺睘浜烘暟")
private Integer donorrelatives;
- @ApiModelProperty("鎹愮尞瀹跺睘鏀舵浜�")
- private String donorpayee;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
index 4f3303f..87ad7f5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementShared.java
@@ -257,13 +257,10 @@
private String donorremark;
@ApiModelProperty("鎹愮尞瀹跺睘璐圭敤閲戦")
- private BigDecimal donoramount;
+ private Double donoramount;
@ApiModelProperty("鎹愮尞瀹跺睘浜烘暟")
private Integer donorrelatives;
-
- @ApiModelProperty("鎹愮尞瀹跺睘鏀舵浜�")
- private String donorpayee;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
new file mode 100644
index 0000000..78220ef
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
@@ -0,0 +1,191 @@
+package com.ruoyi.project.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_reimbursementdetail_shared
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("鎶ラ攢鐢宠鏄庣粏")
+public class ServiceReimbursementdetailShared extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭ID */
+ @ApiModelProperty("涓婚敭ID")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 璧勯噾鐢宠涓昏〃ID */
+ @ApiModelProperty("璧勯噾鐢宠涓昏〃ID")
+ @Excel(name = "璧勯噾鐢宠涓昏〃ID")
+ private Long rbid;
+
+ /** 浜哄憳绫诲埆 */
+ @ApiModelProperty("浜哄憳绫诲埆")
+ @Excel(name = "浜哄憳绫诲埆")
+ private String persontype;
+
+ /** 浜哄憳濮撳悕 */
+ @ApiModelProperty("浜哄憳濮撳悕")
+ @Excel(name = "浜哄憳濮撳悕")
+ private String personname;
+
+ /** 椤哄簭鍙� */
+ @ApiModelProperty("椤哄簭鍙�")
+ @Excel(name = "椤哄簭鍙�")
+ private Long orderno;
+
+ /** 鍑哄彂鏃堕棿 */
+ @ApiModelProperty("鍑哄彂鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍑哄彂鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date starttime;
+
+ /** 鍑哄彂鍦扮偣 */
+ @ApiModelProperty("鍑哄彂鍦扮偣")
+ @Excel(name = "鍑哄彂鍦扮偣")
+ private String departure;
+
+ /** 鍒拌揪鏃堕棿 */
+ @ApiModelProperty("鍒拌揪鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍒拌揪鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date endtime;
+
+ /** 鍒拌揪鍦扮偣 */
+ @ApiModelProperty("鍒拌揪鍦扮偣")
+ @Excel(name = "鍒拌揪鍦扮偣")
+ private String destination;
+
+ /** 澶╂暟 */
+ @ApiModelProperty("澶╂暟")
+ @Excel(name = "澶╂暟")
+ private Long days;
+
+ /** 浜ら�氳垂 */
+ @ApiModelProperty("浜ら�氳垂")
+ @Excel(name = "浜ら�氳垂")
+ private BigDecimal trafficexpense;
+
+ /** 浜ら�氬伐鍏� */
+ @ApiModelProperty("浜ら�氬伐鍏�")
+ @Excel(name = "浜ら�氬伐鍏�")
+ private String traffictype;
+
+ /** 甯傚唴浜ら�氳垂 */
+ @ApiModelProperty("甯傚唴浜ら�氳垂")
+ @Excel(name = "甯傚唴浜ら�氳垂")
+ private BigDecimal cityfee;
+
+ /** 浣忓璐� */
+ @ApiModelProperty("浣忓璐�")
+ @Excel(name = "浣忓璐�")
+ private BigDecimal hotelexpense;
+
+ /** 鍙戠エ寮犳暟 */
+ @ApiModelProperty("鍙戠エ寮犳暟")
+ @Excel(name = "鍙戠エ寮犳暟")
+ private Long invoicecount;
+
+ /** 闄勪欢寮犳暟 */
+ @ApiModelProperty("闄勪欢寮犳暟")
+ @Excel(name = "闄勪欢寮犳暟")
+ private Long attachcount;
+
+ /** 鏉傝垂 */
+ @ApiModelProperty("鏉傝垂")
+ @Excel(name = "鏉傝垂")
+ private BigDecimal otherexpense;
+
+ /** 浼欓璐� */
+ @ApiModelProperty("浼欓璐�")
+ @Excel(name = "浼欓璐�")
+ private BigDecimal foodexpenses;
+
+ /** 浼欓璐硅ˉ鍔� */
+ @ApiModelProperty("浼欓璐硅ˉ鍔�")
+ @Excel(name = "浼欓璐硅ˉ鍔�")
+ private BigDecimal foodallowance;
+
+ /** 闄勪欢琛� */
+ @ApiModelProperty("闄勪欢琛�")
+ @Excel(name = "闄勪欢琛�")
+ private String annexfiles;
+
+ /** 涓婁紶鏍囪瘑 */
+ @ApiModelProperty("涓婁紶鏍囪瘑")
+ @Excel(name = "涓婁紶鏍囪瘑")
+ private String uploadFlag;
+
+ /** 涓婁紶鏃堕棿 */
+ @ApiModelProperty("涓婁紶鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date uploadTime;
+
+ /** 鐩殑鍦扮渷浠� */
+ @ApiModelProperty("鐩殑鍦扮渷浠�")
+ @Excel(name = "鐩殑鍦扮渷浠�")
+ private String travelprovince;
+
+ /** 鐩殑鍦扮渷浠藉悕绉� */
+ @ApiModelProperty("鐩殑鍦扮渷浠藉悕绉�")
+ @Excel(name = "鐩殑鍦扮渷浠藉悕绉�")
+ private String travelprovincename;
+
+ /** 鐩殑鍦板湴甯� */
+ @ApiModelProperty("鐩殑鍦板湴甯�")
+ @Excel(name = "鐩殑鍦板湴甯�")
+ private String travelcity;
+
+ /** 鐩殑鍦板湴甯傚悕绉� */
+ @ApiModelProperty("鐩殑鍦板湴甯傚悕绉�")
+ @Excel(name = "鐩殑鍦板湴甯傚悕绉�")
+ private String travelcityname;
+
+ /** 鐩殑鍦板尯鍘� */
+ @ApiModelProperty("鐩殑鍦板尯鍘�")
+ @Excel(name = "鐩殑鍦板尯鍘�")
+ private String traveltown;
+
+ /** 鐩殑鍦板尯鍘垮悕绉� */
+ @ApiModelProperty("鐩殑鍦板尯鍘垮悕绉�")
+ @Excel(name = "鐩殑鍦板尯鍘垮悕绉�")
+ private String traveltownname;
+
+ /** 鍏朵粬璐圭敤閲戦 */
+ @ApiModelProperty("鍏朵粬璐圭敤閲戦")
+ @Excel(name = "鍏朵粬璐圭敤閲戦")
+ private BigDecimal otherfeeamount;
+
+ /** 鍏朵粬璐圭敤璇存槑 */
+ @ApiModelProperty("鍏朵粬璐圭敤璇存槑")
+ @Excel(name = "鍏朵粬璐圭敤璇存槑")
+ private String otherfeedesc;
+
+ /** 閲戦-鎺ュ彛 */
+ @ApiModelProperty("閲戦-鎺ュ彛")
+ @Excel(name = "閲戦-鎺ュ彛")
+ private String jine;
+
+ /** 鐞嗙敱-鎺ュ彛 */
+ @ApiModelProperty("鐞嗙敱-鎺ュ彛")
+ @Excel(name = "鐞嗙敱-鎺ュ彛")
+ private String liyou;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementdetailSharedMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementdetailSharedMapper.java
new file mode 100644
index 0000000..9cc2130
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementdetailSharedMapper.java
@@ -0,0 +1,23 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import com.ruoyi.project.domain.ServiceReimbursementdetailShared;
+
+/**
+ * 鎶ラ攢鐢宠鏄庣粏Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface ServiceReimbursementdetailSharedMapper extends BaseMapper<ServiceReimbursementdetailShared>
+{
+ /**
+ * 鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃
+ *
+ * @param serviceReimbursementdetailShared 鎶ラ攢鐢宠鏄庣粏
+ * @return 鎶ラ攢鐢宠鏄庣粏闆嗗悎
+ */
+ public List<ServiceReimbursementdetailShared> selectServiceReimbursementdetailSharedList(ServiceReimbursementdetailShared serviceReimbursementdetailShared);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementdetailSharedService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementdetailSharedService.java
new file mode 100644
index 0000000..abc5e3a
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementdetailSharedService.java
@@ -0,0 +1,23 @@
+package com.ruoyi.project.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.ServiceReimbursementdetailShared;
+
+/**
+ * 鎶ラ攢鐢宠鏄庣粏Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+public interface IServiceReimbursementdetailSharedService extends IService<ServiceReimbursementdetailShared>
+{
+
+ /**
+ * 鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃
+ *
+ * @param serviceReimbursementdetailShared 鎶ラ攢鐢宠鏄庣粏
+ * @return 鎶ラ攢鐢宠鏄庣粏闆嗗悎
+ */
+ public List<ServiceReimbursementdetailShared> queryList(ServiceReimbursementdetailShared serviceReimbursementdetailShared);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java
new file mode 100644
index 0000000..a587d85
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementdetailSharedServiceImpl.java
@@ -0,0 +1,136 @@
+package com.ruoyi.project.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+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 java.util.ArrayList;
+import java.util.Map;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.mapper.ServiceReimbursementdetailSharedMapper;
+import com.ruoyi.project.domain.ServiceReimbursementdetailShared;
+import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
+
+/**
+ * 鎶ラ攢鐢宠鏄庣粏Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Service
+public class ServiceReimbursementdetailSharedServiceImpl extends ServiceImpl<ServiceReimbursementdetailSharedMapper, ServiceReimbursementdetailShared> implements IServiceReimbursementdetailSharedService
+{
+
+
+ /**
+ * 鏌ヨ鎶ラ攢鐢宠鏄庣粏鍒楄〃
+ *
+ * @param serviceReimbursementdetailShared 鎶ラ攢鐢宠鏄庣粏
+ * @return 鎶ラ攢鐢宠鏄庣粏
+ */
+ @Override
+ public List<ServiceReimbursementdetailShared> queryList(ServiceReimbursementdetailShared serviceReimbursementdetailShared) {
+ LambdaQueryWrapper<ServiceReimbursementdetailShared> wrappers = Wrappers.lambdaQuery();
+ if (serviceReimbursementdetailShared.getRbid() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getRbid ,serviceReimbursementdetailShared.getRbid());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getPersontype())){
+ wrappers.eq(ServiceReimbursementdetailShared::getPersontype ,serviceReimbursementdetailShared.getPersontype());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getPersonname())){
+ wrappers.like(ServiceReimbursementdetailShared::getPersonname ,serviceReimbursementdetailShared.getPersonname());
+ }
+ if (serviceReimbursementdetailShared.getOrderno() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getOrderno ,serviceReimbursementdetailShared.getOrderno());
+ }
+ if (serviceReimbursementdetailShared.getStarttime() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getStarttime ,serviceReimbursementdetailShared.getStarttime());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getDeparture())){
+ wrappers.eq(ServiceReimbursementdetailShared::getDeparture ,serviceReimbursementdetailShared.getDeparture());
+ }
+ if (serviceReimbursementdetailShared.getEndtime() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getEndtime ,serviceReimbursementdetailShared.getEndtime());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getDestination())){
+ wrappers.eq(ServiceReimbursementdetailShared::getDestination ,serviceReimbursementdetailShared.getDestination());
+ }
+ if (serviceReimbursementdetailShared.getDays() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getDays ,serviceReimbursementdetailShared.getDays());
+ }
+ if (serviceReimbursementdetailShared.getTrafficexpense() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getTrafficexpense ,serviceReimbursementdetailShared.getTrafficexpense());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTraffictype())){
+ wrappers.eq(ServiceReimbursementdetailShared::getTraffictype ,serviceReimbursementdetailShared.getTraffictype());
+ }
+ if (serviceReimbursementdetailShared.getCityfee() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getCityfee ,serviceReimbursementdetailShared.getCityfee());
+ }
+ if (serviceReimbursementdetailShared.getHotelexpense() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getHotelexpense ,serviceReimbursementdetailShared.getHotelexpense());
+ }
+ if (serviceReimbursementdetailShared.getInvoicecount() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getInvoicecount ,serviceReimbursementdetailShared.getInvoicecount());
+ }
+ if (serviceReimbursementdetailShared.getAttachcount() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getAttachcount ,serviceReimbursementdetailShared.getAttachcount());
+ }
+ if (serviceReimbursementdetailShared.getOtherexpense() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getOtherexpense ,serviceReimbursementdetailShared.getOtherexpense());
+ }
+ if (serviceReimbursementdetailShared.getFoodexpenses() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getFoodexpenses ,serviceReimbursementdetailShared.getFoodexpenses());
+ }
+ if (serviceReimbursementdetailShared.getFoodallowance() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getFoodallowance ,serviceReimbursementdetailShared.getFoodallowance());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getAnnexfiles())){
+ wrappers.eq(ServiceReimbursementdetailShared::getAnnexfiles ,serviceReimbursementdetailShared.getAnnexfiles());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getRemark())){
+ wrappers.eq(ServiceReimbursementdetailShared::getRemark ,serviceReimbursementdetailShared.getRemark());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getUploadFlag())){
+ wrappers.eq(ServiceReimbursementdetailShared::getUploadFlag ,serviceReimbursementdetailShared.getUploadFlag());
+ }
+ if (serviceReimbursementdetailShared.getUploadTime() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getUploadTime ,serviceReimbursementdetailShared.getUploadTime());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTravelprovince())){
+ wrappers.eq(ServiceReimbursementdetailShared::getTravelprovince ,serviceReimbursementdetailShared.getTravelprovince());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTravelprovincename())){
+ wrappers.like(ServiceReimbursementdetailShared::getTravelprovincename ,serviceReimbursementdetailShared.getTravelprovincename());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTravelcity())){
+ wrappers.eq(ServiceReimbursementdetailShared::getTravelcity ,serviceReimbursementdetailShared.getTravelcity());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTravelcityname())){
+ wrappers.like(ServiceReimbursementdetailShared::getTravelcityname ,serviceReimbursementdetailShared.getTravelcityname());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTraveltown())){
+ wrappers.eq(ServiceReimbursementdetailShared::getTraveltown ,serviceReimbursementdetailShared.getTraveltown());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getTraveltownname())){
+ wrappers.like(ServiceReimbursementdetailShared::getTraveltownname ,serviceReimbursementdetailShared.getTraveltownname());
+ }
+ if (serviceReimbursementdetailShared.getOtherfeeamount() != null){
+ wrappers.eq(ServiceReimbursementdetailShared::getOtherfeeamount ,serviceReimbursementdetailShared.getOtherfeeamount());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getOtherfeedesc())){
+ wrappers.eq(ServiceReimbursementdetailShared::getOtherfeedesc ,serviceReimbursementdetailShared.getOtherfeedesc());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getJine())){
+ wrappers.eq(ServiceReimbursementdetailShared::getJine ,serviceReimbursementdetailShared.getJine());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementdetailShared.getLiyou())){
+ wrappers.eq(ServiceReimbursementdetailShared::getLiyou ,serviceReimbursementdetailShared.getLiyou());
+ }
+ return this.list(wrappers);
+ }
+
+}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 586c8ef..a17f909 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -50,7 +50,6 @@
<result property="costtype" column="costtype" />
<result property="costtypename" column="costtypename" />
<result property="fileurl" column="fileurl" />
- <result property="donorpayee" column="donorpayee" />
<result property="donorbank" column="donorbank" />
<result property="donorbankcard" column="donorbankcard" />
<result property="donorremark" column="donorremark" />
@@ -59,7 +58,7 @@
</resultMap>
<sql id="selectServiceReimbursementVo">
- select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, remark, RecordStatus, uploadflag, uploadtime, Travelers, DonorName, Reason, FlowLevel, costtype, costtypename,fileurl,donorbank,donorbankcard,donorremark, donoramount,donorrelatives,donorpayee from service_reimbursement
+ select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, remark, RecordStatus, uploadflag, uploadtime, Travelers, DonorName, Reason, FlowLevel, costtype, costtypename,fileurl,donorbank,donorbankcard,donorremark, donoramount,donorrelatives from service_reimbursement
</sql>
<select id="selectServiceReimbursementList" parameterType="ServiceReimbursement" resultMap="ServiceReimbursementResult">
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
index 8e1d076..438d475 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementSharedMapper.xml
@@ -54,7 +54,6 @@
<result property="filename" column="filename" />
<result property="fileid" column="fileid" />
<result property="reimid" column="reimid" />
- <result property="donorpayee" column="donorpayee" />
<result property="donorbank" column="donorbank" />
<result property="donorbankcard" column="donorbankcard" />
<result property="donorremark" column="donorremark" />
@@ -63,7 +62,7 @@
</resultMap>
<sql id="selectServiceReimbursementSharedVo">
- select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, Travelers, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, DonorName, Reason, remark, RecordStatus, uploadflag, uploadtime, totalAmount, bigStrMoney, FlowLevel, costtype, costtypename, oaid, oabdzt, filename, fileid,reimid ,donorbank,donorbankcard,donorremark,donoramount,donorrelatives,donorpayee from service_reimbursement_shared
+ select ID, del_flag, create_by, create_time, update_by, update_time, UserNo, UserName, Travelers, IDCardType, IDCardNo, Phone, DepositBank, BankCardNo, BranchBankName, AnnexBankCard, AnnexFiles, AmountRequested, PrepaidAmount, InvoiceCount, AttachCount, ManagerNo, ManagerName, DeptmentNo, DeptmentName, OPOchecker, FinVicePresident, BusVicePresident, OfficeDirector, FinanceDirector, FinanceChecher, InfoID, DonorNo, DonorName, Reason, remark, RecordStatus, uploadflag, uploadtime, totalAmount, bigStrMoney, FlowLevel, costtype, costtypename, oaid, oabdzt, filename, fileid,reimid ,donorbank,donorbankcard,donorremark, donoramount,donorrelatives from service_reimbursement_shared
</sql>
<select id="getRemShareInfoByRemId" resultType="com.ruoyi.project.domain.ServiceReimbursementShared" resultMap="ServiceReimbursementSharedResult">
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml
new file mode 100644
index 0000000..727cba4
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml
@@ -0,0 +1,90 @@
+<?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.ServiceReimbursementdetailSharedMapper">
+
+ <resultMap type="ServiceReimbursementdetailShared" id="ServiceReimbursementdetailSharedResult">
+ <result property="id" column="ID" />
+ <result property="rbid" column="RBID" />
+ <result property="persontype" column="persontype" />
+ <result property="personname" column="personname" />
+ <result property="orderno" column="OrderNo" />
+ <result property="starttime" column="StartTime" />
+ <result property="departure" column="Departure" />
+ <result property="endtime" column="EndTime" />
+ <result property="destination" column="Destination" />
+ <result property="days" column="Days" />
+ <result property="trafficexpense" column="TrafficExpense" />
+ <result property="traffictype" column="TrafficType" />
+ <result property="cityfee" column="CityFee" />
+ <result property="hotelexpense" column="HotelExpense" />
+ <result property="invoicecount" column="InvoiceCount" />
+ <result property="attachcount" column="AttachCount" />
+ <result property="otherexpense" column="OtherExpense" />
+ <result property="foodexpenses" column="FoodExpenses" />
+ <result property="foodallowance" column="FoodAllowance" />
+ <result property="annexfiles" column="AnnexFiles" />
+ <result property="remark" column="Remark" />
+ <result property="delFlag" column="del_flag" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="uploadFlag" column="upload_flag" />
+ <result property="uploadTime" column="upload_time" />
+ <result property="travelprovince" column="travelprovince" />
+ <result property="travelprovincename" column="travelprovincename" />
+ <result property="travelcity" column="travelcity" />
+ <result property="travelcityname" column="travelcityname" />
+ <result property="traveltown" column="traveltown" />
+ <result property="traveltownname" column="traveltownname" />
+ <result property="otherfeeamount" column="otherfeeamount" />
+ <result property="otherfeedesc" column="otherfeedesc" />
+ <result property="jine" column="jine" />
+ <result property="liyou" column="liyou" />
+ </resultMap>
+
+ <sql id="selectServiceReimbursementdetailSharedVo">
+ select ID, RBID, persontype, personname, OrderNo, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, Remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, jine, liyou from service_reimbursementdetail_shared
+ </sql>
+
+ <select id="selectServiceReimbursementdetailSharedList" parameterType="ServiceReimbursementdetailShared" resultMap="ServiceReimbursementdetailSharedResult">
+ <include refid="selectServiceReimbursementdetailSharedVo"/>
+ <where>
+ <if test="rbid != null "> and RBID = #{rbid}</if>
+ <if test="persontype != null and persontype != ''"> and persontype = #{persontype}</if>
+ <if test="personname != null and personname != ''"> and personname like concat('%', #{personname}, '%')</if>
+ <if test="orderno != null "> and OrderNo = #{orderno}</if>
+ <if test="starttime != null "> and StartTime = #{starttime}</if>
+ <if test="departure != null and departure != ''"> and Departure = #{departure}</if>
+ <if test="endtime != null "> and EndTime = #{endtime}</if>
+ <if test="destination != null and destination != ''"> and Destination = #{destination}</if>
+ <if test="days != null "> and Days = #{days}</if>
+ <if test="trafficexpense != null "> and TrafficExpense = #{trafficexpense}</if>
+ <if test="traffictype != null and traffictype != ''"> and TrafficType = #{traffictype}</if>
+ <if test="cityfee != null "> and CityFee = #{cityfee}</if>
+ <if test="hotelexpense != null "> and HotelExpense = #{hotelexpense}</if>
+ <if test="invoicecount != null "> and InvoiceCount = #{invoicecount}</if>
+ <if test="attachcount != null "> and AttachCount = #{attachcount}</if>
+ <if test="otherexpense != null "> and OtherExpense = #{otherexpense}</if>
+ <if test="foodexpenses != null "> and FoodExpenses = #{foodexpenses}</if>
+ <if test="foodallowance != null "> and FoodAllowance = #{foodallowance}</if>
+ <if test="annexfiles != null and annexfiles != ''"> and AnnexFiles = #{annexfiles}</if>
+ <if test="remark != null and remark != ''"> and Remark = #{remark}</if>
+ <if test="uploadFlag != null and uploadFlag != ''"> and upload_flag = #{uploadFlag}</if>
+ <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
+ <if test="travelprovince != null and travelprovince != ''"> and travelprovince = #{travelprovince}</if>
+ <if test="travelprovincename != null and travelprovincename != ''"> and travelprovincename like concat('%', #{travelprovincename}, '%')</if>
+ <if test="travelcity != null and travelcity != ''"> and travelcity = #{travelcity}</if>
+ <if test="travelcityname != null and travelcityname != ''"> and travelcityname like concat('%', #{travelcityname}, '%')</if>
+ <if test="traveltown != null and traveltown != ''"> and traveltown = #{traveltown}</if>
+ <if test="traveltownname != null and traveltownname != ''"> and traveltownname like concat('%', #{traveltownname}, '%')</if>
+ <if test="otherfeeamount != null "> and otherfeeamount = #{otherfeeamount}</if>
+ <if test="otherfeedesc != null and otherfeedesc != ''"> and otherfeedesc = #{otherfeedesc}</if>
+ <if test="jine != null and jine != ''"> and jine = #{jine}</if>
+ <if test="liyou != null and liyou != ''"> and liyou = #{liyou}</if>
+ </where>
+ </select>
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3