From 0ea6562494682740c8c948658cd3e32769d81c9a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 27 四月 2023 18:12:16 +0800
Subject: [PATCH] “代码提交”
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementdetail.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 17 +
ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseTravelcityService.java | 29 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseTravelcity.java | 67 +++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ReimbursementService.java | 232 +++++++++++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/reportInfo.java | 6
ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseTravelcityMapper.java | 24 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java | 57 ++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseTravelcityServiceImpl.java | 68 +++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/Reimbursementpayee.java | 75 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java | 123 +++++++++
ruoyi-project/src/main/resources/mapper/project/BaseTravelcityMapper.xml | 41 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java | 22 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java | 3
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml | 2
15 files changed, 767 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java
new file mode 100644
index 0000000..c81e15b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java
@@ -0,0 +1,123 @@
+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.BaseTravelcity;
+import com.ruoyi.project.service.IBaseTravelcityService;
+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;
+
+/**
+ * 宸梾鍩庡競鍜岃ˉ璐存爣鍑咰ontroller
+ *
+ * @author ruoyi
+ * @date 2023-04-23
+ */
+@Api("宸梾鍩庡競鍜岃ˉ璐存爣鍑�")
+@RestController
+@RequestMapping("/project/travelcity")
+public class BaseTravelcityController extends BaseController
+{
+ @Autowired
+ private IBaseTravelcityService baseTravelcityService;
+
+ /**
+ * 鏌ヨ宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛�
+ */
+ @ApiOperation("鏌ヨ宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛�")
+ @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(BaseTravelcity baseTravelcity)
+ {
+ startPage();
+ List<BaseTravelcity> list = baseTravelcityService.queryList(baseTravelcity);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛�
+ */
+ @ApiOperation("瀵煎嚭宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛�")
+ @PreAuthorize("@ss.hasPermi('project:travelcity:export')")
+ @Log(title = "宸梾鍩庡競鍜岃ˉ璐存爣鍑�", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(BaseTravelcity baseTravelcity)
+ {
+ List<BaseTravelcity> list = baseTravelcityService.queryList(baseTravelcity);
+ ExcelUtil<BaseTravelcity> util = new ExcelUtil<BaseTravelcity>(BaseTravelcity.class);
+ return util.exportExcel(list, "宸梾鍩庡競鍜岃ˉ璐存爣鍑嗘暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇宸梾鍩庡競鍜岃ˉ璐存爣鍑嗚缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇宸梾鍩庡競鍜岃ˉ璐存爣鍑嗚缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('project:travelcity:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return AjaxResult.success(baseTravelcityService.getById(id));
+ }
+
+ /**
+ * 鏂板宸梾鍩庡競鍜岃ˉ璐存爣鍑�
+ */
+ @ApiOperation("鏂板宸梾鍩庡競鍜岃ˉ璐存爣鍑�")
+ @PreAuthorize("@ss.hasPermi('project:travelcity:add')")
+ @Log(title = "宸梾鍩庡競鍜岃ˉ璐存爣鍑�", businessType = BusinessType.INSERT)
+ @PostMapping
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody BaseTravelcity baseTravelcity)
+ {
+ return toAjax(baseTravelcityService.save(baseTravelcity));
+ }
+
+ /**
+ * 淇敼宸梾鍩庡競鍜岃ˉ璐存爣鍑�
+ */
+ @ApiOperation("淇敼宸梾鍩庡競鍜岃ˉ璐存爣鍑�")
+ @PreAuthorize("@ss.hasPermi('project:travelcity:edit')")
+ @Log(title = "宸梾鍩庡競鍜岃ˉ璐存爣鍑�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody BaseTravelcity baseTravelcity)
+ {
+ return toAjax(baseTravelcityService.updateById(baseTravelcity));
+ }
+
+ /**
+ * 鍒犻櫎宸梾鍩庡競鍜岃ˉ璐存爣鍑�
+ */
+ @ApiOperation("鍒犻櫎宸梾鍩庡競鍜岃ˉ璐存爣鍑�")
+ @PreAuthorize("@ss.hasPermi('project:travelcity:remove')")
+ @Log(title = "宸梾鍩庡競鍜岃ˉ璐存爣鍑�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(baseTravelcityService.removeByIds(Arrays.asList(ids)));
+ }
+
+
+ /**
+ * 鏍规嵁鍖哄煙鑾峰彇浼欓琛ュ姪銆佸叕鏉傝琛ュ姪
+ */
+ @ApiOperation("鏍规嵁鍖哄煙鑾峰彇琛ュ姪")
+ // @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
+ @GetMapping("/getSubsidy/{cityCode}")
+ public AjaxResult getSubsidy(@PathVariable String cityCode)
+ {
+ BaseTravelcity baseTravelcity=baseTravelcityService.getSubsidy(cityCode);
+ return AjaxResult.success(baseTravelcity);
+ }
+}
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 5fe433b..49201e0 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
@@ -663,6 +663,23 @@
}
/**
+ * 淇敼鎶ラ攢鐢宠
+ */
+ @ApiOperation("淇敼鎶ラ攢鐢宠")
+ //@PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
+ @Log(title = "瀹℃牳璐圭敤", businessType = BusinessType.OTHER)
+ @PostMapping("/editMoney")
+ public AjaxResult editMoney(@RequestBody List<ReimbursementService> serviceReimbursement)
+ {
+ boolean b= serviceReimbursementService.updateById(null);
+ if(b)
+ {
+ addReiSharedDatd(null,2);
+ }
+ return toAjax(b);
+ }
+
+ /**
* 鍒犻櫎鎶ラ攢鐢宠
*/
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠")
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 1e49609..69f745a 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
@@ -104,6 +104,28 @@
*/
@ApiOperation("淇敼鎶ラ攢鐢宠鏄庣粏")
//@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
+ @Log(title = "淇敼鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
+ @PostMapping("/updateRDlList")
+ public AjaxResult updateRDlList(@RequestBody List<ServiceReimbursementdetail> serviceReimbursementdetails)
+ {
+ for (ServiceReimbursementdetail serviceReimbursementdetail:serviceReimbursementdetails) {
+
+ if(serviceReimbursementdetail.getId()!=null) {
+ serviceReimbursementdetailService.updateById(serviceReimbursementdetail);
+ }else {
+ //濡傛灉ID涓虹┖锛屽垯瑕佹柊澧�
+ add(serviceReimbursementdetail);
+ }
+ }
+ // return toAjax("null");
+ return null;
+ }
+
+ /**
+ * 淇敼鎶ラ攢鐢宠鏄庣粏
+ */
+ @ApiOperation("淇敼鎶ラ攢鐢宠鏄庣粏")
+ //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:edit')")
@Log(title = "鎶ラ攢鐢宠鏄庣粏", businessType = BusinessType.UPDATE)
@PutMapping
//@RepeatSubmit
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 9f51e08..75f20a3 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
@@ -1,11 +1,19 @@
package com.ruoyi.project.controller;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
+
+import com.ruoyi.project.domain.ReimbursementService;
+import com.ruoyi.project.domain.Reimbursementpayee;
+import io.netty.util.internal.ObjectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -48,7 +56,20 @@
{
startPage();
List<ServiceReimbursementpayee> list = serviceReimbursementpayeeService.queryList(serviceReimbursementpayee);
- return getDataTable(list);
+ List<Reimbursementpayee> reimbursementpayees=new ArrayList<>();
+ for(int i=0;i<list.size();i++){
+ Reimbursementpayee reimbursementpayee=new Reimbursementpayee();
+ reimbursementpayee.setCol_personname(list.get(i).getPersonname());
+ reimbursementpayee.setCol_personType(list.get(i).getPersontype());
+ reimbursementpayee.setCol_accounts(list.get(i).getBankcardno());
+ reimbursementpayee.setCol_date(list.get(i).getPaiddate());
+ reimbursementpayee.setCol_illustrate(list.get(i).getRemark());
+ reimbursementpayee.setId(list.get(i).getId());
+ reimbursementpayee.setRbid(list.get(i).getRbid());
+ reimbursementpayee.setCol_bank(list.get(i).getBankname());
+ reimbursementpayees.add(reimbursementpayee);
+ }
+ return getDataTable(reimbursementpayees);
}
/**
@@ -80,6 +101,40 @@
* 鏂板宸梾鎶ラ攢浠樻淇℃伅
*/
@ApiOperation("鏂板宸梾鎶ラ攢浠樻淇℃伅")
+ @PostMapping("/addOrUpdateRBpayee")
+ public AjaxResult addOrUpdateRBpayee(@RequestBody List<Reimbursementpayee> reimbursementPayees)
+ {
+ List<ServiceReimbursementpayee> addserviceReimbursementpayees=new ArrayList<>();
+ List<ServiceReimbursementpayee> updateserviceReimbursementpayees=new ArrayList<>();
+ for (Reimbursementpayee reimbursementPayee:reimbursementPayees) {
+ ServiceReimbursementpayee serviceReimbursementpayee=new ServiceReimbursementpayee();
+ serviceReimbursementpayee.setRbid(reimbursementPayee.getRbid());
+ serviceReimbursementpayee.setPersonname(reimbursementPayee.getCol_personname());
+ serviceReimbursementpayee.setPersontype(reimbursementPayee.getCol_personType());
+ serviceReimbursementpayee.setBankname(reimbursementPayee.getCol_bank());
+ serviceReimbursementpayee.setBankcardno(reimbursementPayee.getCol_accounts());
+ serviceReimbursementpayee.setPaiddate(reimbursementPayee.getCol_date());
+ serviceReimbursementpayee.setRemark(reimbursementPayee.getCol_illustrate());
+ serviceReimbursementpayee.setId(reimbursementPayee.getId());
+ if(ObjectUtils.isEmpty(reimbursementPayee.getId())){
+ addserviceReimbursementpayees.add(serviceReimbursementpayee);
+ }else {
+ updateserviceReimbursementpayees.add(serviceReimbursementpayee);
+ }
+ }
+ boolean b = false;
+ if(!CollectionUtils.isEmpty(addserviceReimbursementpayees)){
+ b = serviceReimbursementpayeeService.saveBatch(addserviceReimbursementpayees);
+ }else {
+ b = serviceReimbursementpayeeService.updateBatchById(updateserviceReimbursementpayees);
+ }
+ return toAjax(b);
+ }
+
+ /**
+ * 鏂板宸梾鎶ラ攢浠樻淇℃伅
+ */
+ @ApiOperation("鏂板宸梾鎶ラ攢浠樻淇℃伅")
@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')")
@Log(title = "宸梾鎶ラ攢浠樻淇℃伅", businessType = BusinessType.INSERT)
@PostMapping
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseTravelcity.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseTravelcity.java
new file mode 100644
index 0000000..e60582a
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseTravelcity.java
@@ -0,0 +1,67 @@
+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;
+
+import java.math.BigDecimal;
+
+/**
+ * 宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗璞� base_travelcity
+ *
+ * @author ruoyi
+ * @date 2023-04-23
+ */
+@Data
+@ApiModel("宸梾鍩庡競鍜岃ˉ璐存爣鍑�")
+public class BaseTravelcity extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 鍩庡競缂栧彿 */
+ @ApiModelProperty("鍩庡競缂栧彿")
+ @Excel(name = "鍩庡競缂栧彿")
+ private String citycode;
+
+ /** 鍩庡競鍚嶇О */
+ @ApiModelProperty("鍩庡競鍚嶇О")
+ @Excel(name = "鍩庡競鍚嶇О")
+ private String cityname;
+
+ /** 鐪佷唤 */
+ @ApiModelProperty("鐪佷唤")
+ @Excel(name = "鐪佷唤")
+ private String province;
+
+ /** 浜ら�氳ˉ璐撮噾棰� */
+ @ApiModelProperty("浜ら�氳ˉ璐撮噾棰�")
+ @Excel(name = "浜ら�氳ˉ璐撮噾棰�")
+ private BigDecimal transport;
+
+ /** 浣忓琛ヨ创閲戦 */
+ @ApiModelProperty("浣忓琛ヨ创閲戦")
+ @Excel(name = "浣忓琛ヨ创閲戦")
+ private BigDecimal hotel;
+
+ /** 鍏牳璐硅ˉ璐撮噾棰� */
+ @ApiModelProperty("鍏牳璐硅ˉ璐撮噾棰�")
+ @Excel(name = "鍏牳璐硅ˉ璐撮噾棰�")
+ private BigDecimal others;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "鍏牳璐硅ˉ璐撮噾棰�")
+ private BigDecimal food;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ReimbursementService.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ReimbursementService.java
new file mode 100644
index 0000000..2a54dae
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ReimbursementService.java
@@ -0,0 +1,232 @@
+package com.ruoyi.project.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import java.util.Date;
+
+/**
+ * 鎶ラ攢鐢宠瀵硅薄 service_reimbursement
+ *
+ * @author ruoyi
+ * @date 2022-01-24
+ */
+@Data
+@ApiModel("鎶ラ攢鐢宠")
+public class ReimbursementService extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 鎶ラ攢浜虹紪鍙� */
+ @ApiModelProperty("鎶ラ攢浜虹紪鍙�")
+ @Excel(name = "鎶ラ攢浜虹紪鍙�")
+ private String userno;
+
+ /** 鎶ラ攢浜哄鍚� */
+ @ApiModelProperty("鎶ラ攢浜哄鍚�")
+ @Excel(name = "鎶ラ攢浜哄鍚�")
+ private String username;
+
+ /** 璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType */
+ @ApiModelProperty("璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
+ @Excel(name = "璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType")
+ private String idcardtype;
+
+ /** 璇佷欢鍙风爜 */
+ @ApiModelProperty("璇佷欢鍙风爜")
+ @Excel(name = "璇佷欢鍙风爜")
+ private String idcardno;
+
+ /** 鑱旂郴鐢佃瘽 */
+ @ApiModelProperty("鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽")
+ private String phone;
+
+ /** 寮�鎴烽摱琛� */
+ @ApiModelProperty("寮�鎴烽摱琛�")
+ @Excel(name = "寮�鎴烽摱琛�")
+ private String depositbank;
+
+ /** 鍗″彿 */
+ @ApiModelProperty("鍗″彿")
+ @Excel(name = "鍗″彿")
+ private String bankcardno;
+
+ /** 鍒嗚鍚嶇О */
+ @ApiModelProperty("鍒嗚鍚嶇О")
+ @Excel(name = "鍒嗚鍚嶇О")
+ private String branchbankname;
+
+ /** 閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑 */
+ @ApiModelProperty("閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
+ @Excel(name = "閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑")
+ private String annexbankcard;
+
+ /** 闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑 */
+ @ApiModelProperty("闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑")
+ @Excel(name = "闄勪欢璺緞 澶氫釜鐢�;鍒嗗紑")
+ private String annexfiles;
+
+ /** 鐢宠閲戦 */
+ @ApiModelProperty("鐢宠閲戦")
+ @Excel(name = "鐢宠閲戦")
+ private Double amountrequested;
+
+ /** 棰勬敮璐圭敤 */
+ @ApiModelProperty("棰勬敮璐圭敤")
+ @Excel(name = "棰勬敮璐圭敤")
+ private Double prepaidamount;
+
+ /** 鍙戠エ寮犳暟 */
+ @ApiModelProperty("鍙戠エ寮犳暟")
+ @Excel(name = "鍙戠エ寮犳暟")
+ private Long invoicecount;
+
+ /** 闄勪欢鏁� */
+ @ApiModelProperty("闄勪欢鏁�")
+ @Excel(name = "闄勪欢鏁�")
+ private Long attachcount;
+
+ /** 閮ㄩ棬涓荤宸ュ彿 */
+ @ApiModelProperty("閮ㄩ棬涓荤宸ュ彿")
+ @Excel(name = "閮ㄩ棬涓荤宸ュ彿")
+ private String managerno;
+
+ /** 閮ㄩ棬涓荤鍚嶅瓧 */
+ @ApiModelProperty("閮ㄩ棬涓荤鍚嶅瓧")
+ @Excel(name = "閮ㄩ棬涓荤鍚嶅瓧")
+ private String managername;
+
+ /** 閮ㄩ棬缂栧彿 */
+ @ApiModelProperty("閮ㄩ棬缂栧彿")
+ @Excel(name = "閮ㄩ棬缂栧彿")
+ private String deptmentno;
+
+ /** 閮ㄩ棬鍚嶇О */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ private String deptmentname;
+
+ /** 涓績绛惧瓧 */
+ @ApiModelProperty("涓績绛惧瓧")
+ @Excel(name = "涓績绛惧瓧")
+ private String opochecker;
+
+ /** 璐㈠姟鍓櫌闀跨瀛� */
+ @ApiModelProperty("璐㈠姟鍓櫌闀跨瀛�")
+ @Excel(name = "璐㈠姟鍓櫌闀跨瀛�")
+ private String finvicepresident;
+
+ /** 涓氬姟鍓櫌闀跨瀛� */
+ @ApiModelProperty("涓氬姟鍓櫌闀跨瀛�")
+ @Excel(name = "涓氬姟鍓櫌闀跨瀛�")
+ private String busvicepresident;
+
+ /** 鍔炲叕瀹や富浠荤瀛� */
+ @ApiModelProperty("鍔炲叕瀹や富浠荤瀛�")
+ @Excel(name = "鍔炲叕瀹や富浠荤瀛�")
+ private String officedirector;
+
+ /** 璐㈠姟瀹や富浠荤瀛� */
+ @ApiModelProperty("璐㈠姟瀹や富浠荤瀛�")
+ @Excel(name = "璐㈠姟瀹や富浠荤瀛�")
+ private String financedirector;
+
+ /** 璐㈠姟瀹℃牳 */
+ @ApiModelProperty("璐㈠姟瀹℃牳")
+ @Excel(name = "璐㈠姟瀹℃牳")
+ private String financechecher;
+
+ /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
+ private Long infoid;
+
+ /** 鎹愮尞鑰呯紪鍙� */
+ @ApiModelProperty("鎹愮尞鑰呯紪鍙�")
+ @Excel(name = "鎹愮尞鑰呯紪鍙�")
+ private String donorno;
+
+ /** 璁板綍鐘舵�� */
+ @ApiModelProperty("璁板綍鐘舵��")
+ @Excel(name = "璁板綍鐘舵��")
+ private Integer recordstatus;
+
+ /** 涓婁紶鏍囧織 */
+ @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 travelers;
+
+ @ApiModelProperty("鍑哄樊浜嬬敱")
+ private String reason;
+
+ @ApiModelProperty("鎹愮尞鑰呭鍚�")
+ private String donorname;
+
+ @ApiModelProperty("鎬婚噾棰�")
+ private Double totalamount;
+
+ @ApiModelProperty("鎬婚噾棰濈殑澶у啓")
+ private String bigstrmoney;
+
+ /** 闄勪欢鍦板潃锛宎dd by yangjb 20221124 */
+ @ApiModelProperty("闄勪欢鍦板潃")
+ private String fileurl;
+
+ private String remark;
+
+ /** 褰撳墠瀹℃牳绾у埆 澶勪簬鍝釜闃舵 0锛氱敵璇凤紱1锛氫竴绾у鏍革紱2锛氫簩绾у鏍革紱3锛氫笁绾у鏍哥瓑 */
+ @ApiModelProperty("褰撳墠瀹℃牳绾у埆")
+ private Long flowlevel;
+
+
+ /** 璐圭敤褰掑睘锛�0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞� */
+ @ApiModelProperty("璐圭敤褰掑睘")
+ private String costtype;
+
+ /** 璐圭敤褰掑睘鎻忚堪 */
+ @ApiModelProperty("璐圭敤褰掑睘鎻忚堪")
+ private String costtypename;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘閾惰")
+ private String donorbank;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘閾惰鍗″彿")
+ private String donorbankcard;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘璐圭敤璇存槑")
+ private String donorremark;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘璐圭敤閲戦")
+ private Double donoramount;
+
+ @ApiModelProperty("鎹愮尞瀹跺睘浜烘暟")
+ private String personname2;
+
+ @ApiModelProperty("aaaa")
+ private String destination2;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/Reimbursementpayee.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/Reimbursementpayee.java
new file mode 100644
index 0000000..bd167a0
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/Reimbursementpayee.java
@@ -0,0 +1,75 @@
+package com.ruoyi.project.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 宸梾鎶ラ攢浠樻淇℃伅瀵硅薄 service_reimbursementpayee
+ *
+ * @author ruoyi
+ * @date 2023-04-20
+ */
+@Data
+@ApiModel("宸梾鎶ラ攢浠樻淇℃伅")
+public class Reimbursementpayee 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 Long orderno;
+
+ /** 浜哄憳绫诲埆锛堝瓧鍏歌〃锛歴ys_travelexpensebelong锛夛細0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞� */
+ @ApiModelProperty("浜哄憳绫诲埆锛堝瓧鍏歌〃锛歴ys_travelexpensebelong锛夛細0锛氬叾浠栦汉鍛橈紱1锛氫笓鑱屼汉鍛橈紱2锛氬崗璋冨憳锛�3锛氫笓瀹讹紱4锛氭崘鐚�呭灞�")
+ @Excel(name = "浜哄憳绫诲埆", readConverterExp = "瀛�=鍏歌〃锛歴ys_travelexpensebelong")
+ private String col_personType;
+
+ /** 鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹� */
+ @ApiModelProperty("鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
+ @Excel(name = "鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�")
+ private String col_personname;
+
+ /** 寮�鎴烽摱琛� */
+ @ApiModelProperty("寮�鎴烽摱琛�")
+ @Excel(name = "鏀舵閾惰")
+ private String col_bank;
+
+ /** 鍗″彿 */
+ @ApiModelProperty("鍗″彿")
+ @Excel(name = "鍗″彿")
+ private String col_accounts;
+
+ /** 瑙ｉ噴璇存槑 */
+ @ApiModelProperty("瑙ｉ噴璇存槑")
+ @Excel(name = "瑙ｉ噴璇存槑")
+ private String col_illustrate;
+
+ /** 浠樻鏃ユ湡 */
+ @ApiModelProperty("浠樻鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "浠樻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date col_date;
+
+}
+
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 dffa2e6..9a129cd 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
@@ -160,5 +160,8 @@
private Integer orderno;
+ private String persontype;
+ private String personname;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/reportInfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/reportInfo.java
index 17f0be3..370313f 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/reportInfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/reportInfo.java
@@ -10,4 +10,10 @@
private String reportNo;
private String reportName;
+
+ private String depositbank;
+
+ private String branchbankname;
+
+ private String bankcardno;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseTravelcityMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseTravelcityMapper.java
new file mode 100644
index 0000000..c97b094
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseTravelcityMapper.java
@@ -0,0 +1,24 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.BaseTravelcity;
+
+import java.util.List;
+
+/**
+ * 宸梾鍩庡競鍜岃ˉ璐存爣鍑哅apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-04-23
+ */
+public interface BaseTravelcityMapper extends BaseMapper<BaseTravelcity>
+{
+ /**
+ * 鏌ヨ宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛�
+ *
+ * @param baseTravelcity 宸梾鍩庡競鍜岃ˉ璐存爣鍑�
+ * @return 宸梾鍩庡競鍜岃ˉ璐存爣鍑嗛泦鍚�
+ */
+ public List<BaseTravelcity> selectBaseTravelcityList(BaseTravelcity baseTravelcity);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseTravelcityService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseTravelcityService.java
new file mode 100644
index 0000000..5797948
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseTravelcityService.java
@@ -0,0 +1,29 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.BaseTravelcity;
+
+import java.util.List;
+
+/**
+ * 宸梾鍩庡競鍜岃ˉ璐存爣鍑哠ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-04-23
+ */
+public interface IBaseTravelcityService extends IService<BaseTravelcity>
+{
+
+ /**
+ * 鏌ヨ宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛�
+ *
+ * @param baseTravelcity 宸梾鍩庡競鍜岃ˉ璐存爣鍑�
+ * @return 宸梾鍩庡競鍜岃ˉ璐存爣鍑嗛泦鍚�
+ */
+ public List<BaseTravelcity> queryList(BaseTravelcity baseTravelcity);
+
+ /**
+ * 鏍规嵁鍖哄煙鑾峰彇浼欓琛ュ姪銆佸叕鏉傝琛ュ姪
+ */
+ public BaseTravelcity getSubsidy(String cityCode);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseTravelcityServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseTravelcityServiceImpl.java
new file mode 100644
index 0000000..0e674b5
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseTravelcityServiceImpl.java
@@ -0,0 +1,68 @@
+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.BaseTravelcity;
+import com.ruoyi.project.mapper.BaseTravelcityMapper;
+import com.ruoyi.project.service.IBaseTravelcityService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 宸梾鍩庡競鍜岃ˉ璐存爣鍑哠ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-04-23
+ */
+@Service
+public class BaseTravelcityServiceImpl extends ServiceImpl<BaseTravelcityMapper, BaseTravelcity> implements IBaseTravelcityService
+{
+
+
+ /**
+ * 鏌ヨ宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛�
+ *
+ * @param baseTravelcity 宸梾鍩庡競鍜岃ˉ璐存爣鍑�
+ * @return 宸梾鍩庡競鍜岃ˉ璐存爣鍑�
+ */
+ @Override
+ public List<BaseTravelcity> queryList(BaseTravelcity baseTravelcity) {
+ LambdaQueryWrapper<BaseTravelcity> wrappers = Wrappers.lambdaQuery();
+ if (StringUtils.isNotBlank(baseTravelcity.getCitycode())){
+ wrappers.eq(BaseTravelcity::getCitycode ,baseTravelcity.getCitycode());
+ }
+ if (StringUtils.isNotBlank(baseTravelcity.getCityname())){
+ wrappers.like(BaseTravelcity::getCityname ,baseTravelcity.getCityname());
+ }
+ if (StringUtils.isNotBlank(baseTravelcity.getProvince())){
+ wrappers.eq(BaseTravelcity::getProvince ,baseTravelcity.getProvince());
+ }
+ if (baseTravelcity.getTransport() != null){
+ wrappers.eq(BaseTravelcity::getTransport ,baseTravelcity.getTransport());
+ }
+ if (baseTravelcity.getHotel() != null){
+ wrappers.eq(BaseTravelcity::getHotel ,baseTravelcity.getHotel());
+ }
+ if (baseTravelcity.getOthers() != null){
+ wrappers.eq(BaseTravelcity::getOthers ,baseTravelcity.getOthers());
+ }
+ if (baseTravelcity.getFood() != null){
+ wrappers.eq(BaseTravelcity::getFood ,baseTravelcity.getFood());
+ }
+ return this.list(wrappers);
+ }
+
+ @Override
+ public BaseTravelcity getSubsidy(String cityCode) {
+ LambdaQueryWrapper<BaseTravelcity> wrappers = Wrappers.lambdaQuery();
+ if (StringUtils.isNotBlank(cityCode)){
+ wrappers.eq(BaseTravelcity::getCitycode ,cityCode);
+ }
+ BaseTravelcity baseTravelcity = this.getOne(wrappers);
+ return baseTravelcity;
+ }
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java
index 7ed5337..4c570f4 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceExternalpersonServiceImpl.java
@@ -62,6 +62,9 @@
r.setId(s.getId());
r.setReportNo(s.getUserno());
r.setReportName(s.getUsername());
+ r.setBankcardno(s.getBankcardno());
+ r.setDepositbank(s.getDepositbank());
+ r.setBranchbankname(s.getBranchbankname());
list.add(r);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/BaseTravelcityMapper.xml b/ruoyi-project/src/main/resources/mapper/project/BaseTravelcityMapper.xml
new file mode 100644
index 0000000..89c0b4b
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/BaseTravelcityMapper.xml
@@ -0,0 +1,41 @@
+<?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.BaseTravelcityMapper">
+
+ <resultMap type="BaseTravelcity" id="BaseTravelcityResult">
+ <result property="id" column="id" />
+ <result property="citycode" column="citycode" />
+ <result property="cityname" column="cityname" />
+ <result property="province" column="province" />
+ <result property="transport" column="transport" />
+ <result property="hotel" column="hotel" />
+ <result property="others" column="others" />
+ <result property="food" column="food" />
+ <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" />
+ </resultMap>
+
+ <sql id="selectBaseTravelcityVo">
+ select id, citycode, cityname, province, transport, hotel, others, food, remark, del_flag, create_by, create_time, update_by, update_time from base_travelcity
+ </sql>
+
+ <select id="selectBaseTravelcityList" parameterType="BaseTravelcity" resultMap="BaseTravelcityResult">
+ <include refid="selectBaseTravelcityVo"/>
+ <where>
+ <if test="citycode != null and citycode != ''"> and citycode = #{citycode}</if>
+ <if test="cityname != null and cityname != ''"> and cityname like concat('%', #{cityname}, '%')</if>
+ <if test="province != null and province != ''"> and province = #{province}</if>
+ <if test="transport != null "> and transport = #{transport}</if>
+ <if test="hotel != null "> and hotel = #{hotel}</if>
+ <if test="others != null "> and others = #{others}</if>
+ <if test="food != null "> and food = #{food}</if>
+ </where>
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
index 836de38..8c1ed65 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
@@ -41,7 +41,7 @@
</resultMap>
<sql id="selectServiceReimbursementdetailVo">
- select ID, RBID, 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, OrderNo from service_reimbursementdetail
+ select ID, RBID, 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, OrderNo,personname,persontype from service_reimbursementdetail
</sql>
<select id="selectServiceReimbursementdetailList" parameterType="ServiceReimbursementdetail" resultMap="ServiceReimbursementdetailResult">
--
Gitblit v1.9.3