From 22655ad10d386f0fc3c38389f519d3d188b46f19 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 十月 2023 16:29:54 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java | 12 ++
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 4
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 2
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml | 195 ++++++++++++++++++++------------
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java | 6 +
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java | 5
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFundService.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 7
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java | 5
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java | 8 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 35 ++---
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementService.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 6 +
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java | 2
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFund.java | 4
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailVO.java | 12 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java | 4
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml | 1
25 files changed, 217 insertions(+), 114 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 259a1ff..e5f649b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -72,10 +72,6 @@
@PostMapping("/common/upload")
public AjaxResult uploadFile(MultipartFile file) throws Exception {
- int tomcatPort1 = getTomcatPort();
- log.info("tomcatPort1鐨勫�间负锛� {}", tomcatPort1);
- //杩欎釜鐪佷汉姘戞槸8099锛屾墍浠ョ洿鎺ュ啓姝�
- int tomcatPort = 8099;
try {
// 涓婁紶鏂囦欢璺緞
String filePath = RuoYiConfig.getUploadPath();
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 e2ca705..286ac62 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
@@ -128,6 +128,7 @@
Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
Integer pageNum = spFinancialExpensesIn.getPageNum();
Integer pageSize = spFinancialExpensesIn.getPageSize();
+ Integer checkstatus = spFinancialExpensesIn.getCheckstatus();
if (pageNum == null) {
pageNum = 1;
@@ -150,7 +151,7 @@
}
//startPage();
- List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
+ List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE,checkstatus);
//閫氳繃鎹愮尞鑰呰繃婊�
if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
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 a0d8937..b081144 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
@@ -1,32 +1,23 @@
package com.ruoyi.web.controller.project;
-import java.io.*;
-import java.util.*;
-
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.domain.FunddetailReqVo;
-import com.ruoyi.project.domain.vo.TaxMoneyVO;
-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.ServiceFunddetail;
-import com.ruoyi.project.service.IServiceFunddetailService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
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.FunddetailReqVo;
+import com.ruoyi.project.domain.ServiceFunddetail;
+import com.ruoyi.project.domain.vo.TaxMoneyVO;
+import com.ruoyi.project.service.IServiceFunddetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 璐圭敤鐢宠鏄庣粏Controller
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 87f9310..cf2d34f 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
@@ -135,6 +135,7 @@
String APPLICATIONENDTIME = spFinancialExpensesIn.getAPPLICATIONENDTIME();
Integer CHECKFLAG = spFinancialExpensesIn.getCHECKFLAG();
Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
+ Integer checkstatus = spFinancialExpensesIn.getCheckstatus();
Integer pageNum = spFinancialExpensesIn.getPageNum();
Integer pageSize = spFinancialExpensesIn.getPageSize();
@@ -158,7 +159,7 @@
APPLICATIONENDTIME = "";
}
//startPage();
- List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
+ List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE,checkstatus);
//鏍规嵁缁忓姙浜虹瓫閫�
if (StringUtils.isNotBlank(spFinancialExpensesIn.getUsername())) {
list = list.stream().filter(reimbursementOut -> reimbursementOut.getUsername().contains(spFinancialExpensesIn.getUsername())).collect(Collectors.toList()); // 鎸塶ame瀛楁杩囨护
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
index b176898..186c1b6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -103,9 +103,13 @@
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
+ //灏嗗墠绔紶鏉ョ殑闄勪欢闆嗗悎杞垚瀛楃涓�
if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) {
serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
}
+ if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
+ serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
+ }
return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
}
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 08e3e8b..e7fad0f 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
@@ -329,8 +329,8 @@
/**
* 棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡
*/
- @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
- @Excel(name = "棰勫鐘舵�侊細1銆佸緟棰勫锛�2銆侀绠楅�氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡锛�3銆佹敹鍒扮焊璐ㄦ姤閿�鏉愭枡")
+ @ApiModelProperty("棰勫鐘舵�侊細1銆佸緟瀹℃煡锛�2銆佸鏍搁�氳繃绛夊緟鏉愭枡锛�3銆佸凡鏀跺埌鏉愭枡")
+ @Excel(name = "棰勫鐘舵�侊細1銆佸緟瀹℃煡锛�2銆佸鏍搁�氳繃绛夊緟鏉愭枡锛�3銆佸凡鏀跺埌鏉愭枡")
private Integer checkstatus;
/**
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
index d476d9f..1885ff9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -333,6 +333,12 @@
@ApiModelProperty("闄勪欢鏂囦欢鍦板潃")
private String annexfiles;
+ /**
+ * 闄勪欢鏂囦欢鍦板潃
+ */
+ @ApiModelProperty("鍙戠エ鏂囦欢鍦板潃")
+ private String invoiceFiles;
+
/**
* 璁＄畻绋庤垂鏃堕棿
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
index a47ce33..c49ccbf 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailShared.java
@@ -116,6 +116,12 @@
private String annexfiles;
/**
+ * 闄勪欢鏂囦欢鍦板潃
+ */
+ @ApiModelProperty("鍙戠エ鏂囦欢鍦板潃")
+ private String invoiceFiles;
+
+ /**
* 宸ヤ綔鍗曚綅
*/
@ApiModelProperty("宸ヤ綔鍗曚綅")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
index 7eff77b..374fce1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
@@ -339,6 +339,18 @@
private String annexfiles;
/**
+ * 鍙戠エ鏂囦欢鍦板潃闆嗗悎锛堢敤浜庢帴鏀跺墠绔紶鏉ョ殑鍦板潃锛�
+ */
+ @ApiModelProperty("鍙戠エ鏂囦欢鍦板潃闆嗗悎")
+ private List invoiceFilesList;
+
+ /**
+ * 闄勪欢鏂囦欢鍦板潃
+ */
+ @ApiModelProperty("鍙戠エ鏂囦欢鍦板潃")
+ private String invoiceFiles;
+
+ /**
* 璁＄畻绋庤垂鏃堕棿
*/
@ApiModelProperty("璁＄畻绋庤垂鏃堕棿")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java
index f6593e2..095c3dd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java
@@ -155,6 +155,14 @@
private String annexfiles;
/**
+ * 鍙戠エ闄勪欢琛�
+ */
+ @ApiModelProperty("鍙戠エ闄勪欢琛�")
+ @Excel(name = "鍙戠エ闄勪欢琛�")
+ private String invoicefiles;
+
+
+ /**
* 涓婁紶鏍囪瘑
*/
@ApiModelProperty("涓婁紶鏍囪瘑")
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
index 20a6a11..fd910cc 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailShared.java
@@ -136,6 +136,11 @@
@Excel(name = "闄勪欢琛�")
private String annexfiles;
+ /** 闄勪欢琛� */
+ @ApiModelProperty("鍙戠エ闄勪欢琛�")
+ @Excel(name = "鍙戠エ闄勪欢琛�")
+ private String invoicefiles;
+
/** 涓婁紶鏍囪瘑 */
@ApiModelProperty("涓婁紶鏍囪瘑")
@Excel(name = "涓婁紶鏍囪瘑")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailVO.java
index 90b734c..0c22e8b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetailVO.java
@@ -159,6 +159,18 @@
private List annexfilesList;
/**
+ * 鍙戠エ闆嗗悎琛�
+ */
+ private List invoicefilesList;
+
+ /**
+ * 鍙戠エ闄勪欢琛�
+ */
+ @ApiModelProperty("鍙戠エ闄勪欢琛�")
+ @Excel(name = "鍙戠エ闄勪欢琛�")
+ private String invoicefiles;
+
+ /**
* 涓婁紶鏍囪瘑
*/
@ApiModelProperty("涓婁紶鏍囪瘑")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
index 433fc23..124bcb1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesIn.java
@@ -69,4 +69,9 @@
@ApiModelProperty("閲戦")
private Double money;
+ /**
+ * 閲戦
+ */
+ @ApiModelProperty("閲戦")
+ private Integer checkstatus;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java
index d0e5cce..4c14de1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundMapper.java
@@ -34,7 +34,7 @@
List<FundVO> selectVOList(FundVO fundVO);
- List<SpFinancialExpensesFundOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE);
+ List<SpFinancialExpensesFundOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE, @Param("CHECKSTATUS") Integer CHECKSTATUS);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java
index 233adcc..6e5dbf5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceReimbursementMapper.java
@@ -32,7 +32,7 @@
List<ServiceReimbursement> selectSearchList(ServiceReimbursementDto serviceReimbursementdto);
- List<SpFinancialExpensesReimbursementOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE);
+ List<SpFinancialExpensesReimbursementOut> getListBypower(@Param("PAUSERNO") String PAUSERNO, @Param("PAFUNDTYPE") Integer PAFUNDTYPE, @Param("PAAPPLICANT") String PAAPPLICANT, @Param("PAAPPLICATIONBEGTIME") String PAAPPLICATIONBEGTIME, @Param("PAAPPLICATIONENDTIME") String PAAPPLICATIONENDTIME, @Param("PADEPARTMENT") String PADEPARTMENT, @Param("CHECKFLAG") Integer CHECKFLAG, @Param("APPLYTYPE") Integer APPLYTYPE, @Param("CHECKSTATUS") Integer CHECKSTATUS);
List<ServiceReimbursement> getInfoByInfoId(Long infoid);
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 afce50b..2443c51 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
@@ -52,7 +52,7 @@
String returnId(Long id);
- List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE);
+ List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS);
int countItem(Long infoid, Long itemid);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementService.java
index aca6654..d04e65e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementService.java
@@ -38,7 +38,7 @@
List<ServiceReimbursement> selectSearchList(ServiceReimbursementDto serviceReimbursementdto);
- List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE);
+ List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS);
List<ServiceReimbursement> getInfoByInfoId(Long infoid);
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 2b30630..115b3f8 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
@@ -659,8 +659,8 @@
}
@Override
- public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE) {
- return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE);
+ public List<SpFinancialExpensesFundOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS) {
+ return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE,CHECKSTATUS);
}
@Override
@@ -696,6 +696,9 @@
if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
}
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoiceFilesList())) {
+ serviceFunddetailVO.setInvoiceFiles(JSON.toJSONString(serviceFunddetailVO.getInvoiceFilesList()));
+ }
ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
if (serviceFunddetailVO.getId() == null) {
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index e2427b8..467f243 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -205,8 +205,8 @@
}
@Override
- public List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE) {
- return serviceReimbursementMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE);
+ public List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT, Integer CHECKFLAG, Integer APPLYTYPE,Integer CHECKSTATUS) {
+ return serviceReimbursementMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE,CHECKSTATUS);
}
@Override
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index edd80fb..1b70c10 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -245,7 +245,7 @@
<select id="getListBypower" statementType="CALLABLE"
resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
- call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER})
+ call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER})
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index d1e0bde..e287136 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -57,6 +57,8 @@
<result property="subjecttype" column="subjecttype"/>
<result property="subjecttypename" column="subjecttypename"/>
<result property="annexfiles" column="AnnexFiles"/>
+ <result property="invoiceFiles" column="InvoiceFiles"/>
+
<result property="taxTime" column="tax_time"/>
<result property="jxrq" column="jxrq"/>
<result property="itemdescribe" column="ItemDescribe"/>
@@ -115,6 +117,7 @@
subjecttype,
subjecttypename,
AnnexFiles,
+ InvoiceFiles,
tax_time,
jxrq,
ItemDescribe
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
index 67577fa..42f4fbe 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailSharedMapper.xml
@@ -30,6 +30,8 @@
<result property="branchbankname" column="BranchBankName"/>
<result property="annexbankcard" column="AnnexBankCard"/>
<result property="annexregistform" column="AnnexRegistForm"/>
+ <result property="annexfiles" column="AnnexFiles"/>
+ <result property="invoiceFiles" column="InvoiceFiles"/>
<result property="quantity" column="Quantity"/>
<result property="price" column="Price"/>
<result property="amount" column="Amount"/>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 1874589..cc09c72 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -158,7 +158,7 @@
<select id="getListBypower" statementType="CALLABLE"
resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut">
- call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER})
+ call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER})
</select>
<select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceReimbursement">
<include refid="selectServiceReimbursementVo"/>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
index 18ab0a7..02b0021 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
@@ -22,6 +22,7 @@
<result property="foodexpenses" column="FoodExpenses" />
<result property="foodallowance" column="FoodAllowance" />
<result property="annexfiles" column="AnnexFiles" />
+ <result property="invoicefiles" column="InvoiceFiles" />
<result property="remark" column="remark" />
<result property="del_flag" column="del_flag" />
<result property="createBy" column="create_by" />
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml
index 046171e..6f5a736 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailSharedMapper.xml
@@ -1,87 +1,134 @@
<?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">
+ 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="com.ruoyi.project.domain.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="del_flag" 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" />
+
+ <resultMap type="com.ruoyi.project.domain.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="invoicefiles" column="InvoiceFiles"/>
+ <result property="remark" column="Remark"/>
+ <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"/>
+ <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"/>
</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 from service_reimbursementdetail_shared
+ select ID,
+ RBID,
+ persontype,
+ personname,
+ OrderNo,
+ StartTime,
+ Departure,
+ EndTime,
+ Destination,
+ Days,
+ TrafficExpense,
+ TrafficType,
+ CityFee,
+ HotelExpense,
+ InvoiceCount,
+ AttachCount,
+ OtherExpense,
+ FoodExpenses,
+ FoodAllowance,
+ AnnexFiles,
+ invoicefiles,
+ Remark,
+ del_flag,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ upload_flag,
+ upload_time,
+ travelprovince,
+ travelprovincename,
+ travelcity,
+ travelcityname,
+ traveltown,
+ traveltownname,
+ otherfeeamount,
+ otherfeedesc
+ from service_reimbursementdetail_shared
</sql>
- <select id="selectServiceReimbursementdetailSharedList" parameterType="com.ruoyi.project.domain.ServiceReimbursementdetailShared" resultMap="ServiceReimbursementdetailSharedResult">
+ <select id="selectServiceReimbursementdetailSharedList"
+ parameterType="com.ruoyi.project.domain.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>
+ <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>
--
Gitblit v1.9.3