From 467780e481263910e2ed3f2852a19ce097667795 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 09 五月 2023 22:34:03 +0800
Subject: [PATCH] 分享表数据新增接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 11 +++
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceReimbursementService.java | 8 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 105 +++++++++++++++++++++++++----------
3 files changed, 94 insertions(+), 30 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 cac7c25..0d00995 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
@@ -188,6 +188,17 @@
}
/**
+ * 寰�service_reimbursement_share,寰�service_reimbursementdetail_share,寰�service_reimbursementpyee_share鏂板澶囦唤鏁版嵁
+ * @param id
+ * @return
+ */
+ @GetMapping("/addShareData/{id}")
+ public AjaxResult addSharedData(@PathVariable("id") Long id) {
+
+ return AjaxResult.success(serviceReimbursementService.addSharedData(id));
+ }
+
+ /**
* 鏂板鎶ラ攢鐢宠
*/
@ApiOperation("鏂板鎶ラ攢鐢宠")
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 58eed72..73e7e69 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
@@ -29,6 +29,14 @@
List<ServiceReimbursementdetail> getRBDetailList(Long id);
+ /**
+ * 鏂板澶囦唤鏁版嵁
+ * @param id
+ * @return
+ */
+ Boolean addSharedData(Long id);
+
+
List<ServiceReimbursement> selectSearchList(ServiceReimbursementDto serviceReimbursementdto);
List<SpFinancialExpensesReimbursementOut> getListBypower(String PAUSERNO, Integer PAFUNDTYPE, String PAAPPLICANT, String PAAPPLICATIONBEGTIME, String PAAPPLICATIONENDTIME, String PADEPARTMENT,Integer CHECKFLAG,Integer APPLYTYPE);
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 f96033b..0bff6a2 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
@@ -1,73 +1,97 @@
package com.ruoyi.project.service.impl;
+import java.util.HashMap;
import java.util.List;
+
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.project.domain.ServiceReimbursementEo;
-import com.ruoyi.project.domain.ServiceReimbursementdetail;
-import com.ruoyi.project.domain.ServiceRelativesconfirmation;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
+import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.dto.ServiceReimbursementDto;
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
-import com.ruoyi.project.mapper.ServiceReimbursementdetailMapper;
+import com.ruoyi.project.mapper.*;
+import com.ruoyi.project.service.IServiceReimbursementSharedService;
+import com.ruoyi.project.service.IServiceReimbursementdetailSharedService;
+import com.ruoyi.project.service.IServiceReimbursementpayeeSharedService;
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.ServiceReimbursementMapper;
-import com.ruoyi.project.domain.ServiceReimbursement;
import com.ruoyi.project.service.IServiceReimbursementService;
/**
* 鎶ラ攢鐢宠Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2022-01-24
*/
@Service
-public class ServiceReimbursementServiceImpl extends ServiceImpl<ServiceReimbursementMapper, ServiceReimbursement> implements IServiceReimbursementService
-{
+public class ServiceReimbursementServiceImpl extends ServiceImpl<ServiceReimbursementMapper, ServiceReimbursement> implements IServiceReimbursementService {
@Autowired
ServiceReimbursementMapper serviceReimbursementMapper;
@Autowired
+ ServiceReimbursementSharedMapper serviceReimbursementShareMapper;
+
+ @Autowired
ServiceReimbursementdetailMapper serviceReimbursementdetailMapper;
+
+ @Autowired
+ ServiceReimbursementdetailSharedMapper serviceReimbursementdetailSharedMapper;
+
+ @Autowired
+ ServiceReimbursementpayeeMapper reimbursementpayeeMapper;
+
+ @Autowired
+ ServiceReimbursementpayeeSharedMapper reimbursementpayeeSharedMapper;
+
+ @Autowired
+ IServiceReimbursementdetailSharedService detailSharedService;
+
+ @Autowired
+ IServiceReimbursementSharedService sharedService;
+
+ @Autowired
+ IServiceReimbursementpayeeSharedService payeeSharedService;
/**
* 鏌ヨ鎶ラ攢鐢宠鍒楄〃
- *
+ *
* @param serviceReimbursement 鎶ラ攢鐢宠
* @return 鎶ラ攢鐢宠
*/
@Override
public List<ServiceReimbursement> queryList(ServiceReimbursement serviceReimbursement) {
LambdaQueryWrapper<ServiceReimbursement> wrappers = Wrappers.lambdaQuery();
- if (StringUtils.isNotBlank(serviceReimbursement.getCreateBy())){
- wrappers.eq(ServiceReimbursement::getCreateBy ,serviceReimbursement.getCreateBy());
+ if (StringUtils.isNotBlank(serviceReimbursement.getCreateBy())) {
+ wrappers.eq(ServiceReimbursement::getCreateBy, serviceReimbursement.getCreateBy());
}
- if (serviceReimbursement.getCreateTime() != null){
- wrappers.eq(ServiceReimbursement::getCreateTime ,serviceReimbursement.getCreateTime());
+ if (serviceReimbursement.getCreateTime() != null) {
+ wrappers.eq(ServiceReimbursement::getCreateTime, serviceReimbursement.getCreateTime());
}
- if (StringUtils.isNotBlank(serviceReimbursement.getUsername())){
- wrappers.like(ServiceReimbursement::getUsername ,serviceReimbursement.getUsername());
+ if (StringUtils.isNotBlank(serviceReimbursement.getUsername())) {
+ wrappers.like(ServiceReimbursement::getUsername, serviceReimbursement.getUsername());
}
- if (StringUtils.isNotBlank(serviceReimbursement.getTravelers())){
- wrappers.like(ServiceReimbursement::getTravelers ,serviceReimbursement.getTravelers());
+ if (StringUtils.isNotBlank(serviceReimbursement.getTravelers())) {
+ wrappers.like(ServiceReimbursement::getTravelers, serviceReimbursement.getTravelers());
}
- if (StringUtils.isNotBlank(serviceReimbursement.getDeptmentname())){
- wrappers.like(ServiceReimbursement::getDeptmentname ,serviceReimbursement.getDeptmentname());
+ if (StringUtils.isNotBlank(serviceReimbursement.getDeptmentname())) {
+ wrappers.like(ServiceReimbursement::getDeptmentname, serviceReimbursement.getDeptmentname());
}
- if (StringUtils.isNotBlank(serviceReimbursement.getDonorno())){
- wrappers.eq(ServiceReimbursement::getDonorno ,serviceReimbursement.getDonorno());
+ if (StringUtils.isNotBlank(serviceReimbursement.getDonorno())) {
+ wrappers.eq(ServiceReimbursement::getDonorno, serviceReimbursement.getDonorno());
}
- if (serviceReimbursement.getRecordstatus()!=null){
- wrappers.eq(ServiceReimbursement::getRecordstatus ,serviceReimbursement.getRecordstatus());
+ if (serviceReimbursement.getRecordstatus() != null) {
+ wrappers.eq(ServiceReimbursement::getRecordstatus, serviceReimbursement.getRecordstatus());
}
- if (StringUtils.isNotBlank(serviceReimbursement.getUploadflag())){
- wrappers.eq(ServiceReimbursement::getUploadflag ,serviceReimbursement.getUploadflag());
+ if (StringUtils.isNotBlank(serviceReimbursement.getUploadflag())) {
+ wrappers.eq(ServiceReimbursement::getUploadflag, serviceReimbursement.getUploadflag());
}
/* if (serviceReimbursement.getStarttime()!=null && serviceReimbursement.getEndtime()!=null){
@@ -88,13 +112,34 @@
}
@Override
+ public Boolean addSharedData(Long id) {
+ ServiceReimbursement serviceReimbursement = serviceReimbursementMapper.selectById(id);
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("rbid", id);
+ //鑾峰彇璇︽儏鏁版嵁
+ List<ServiceReimbursementdetail> details = serviceReimbursementdetailMapper.selectByMap(columnMap);
+ //鑾峰彇鏀粯鏁版嵁
+ List<ServiceReimbursementpayee> serviceReimbursementpayees = reimbursementpayeeMapper.selectByMap(columnMap);
+ //鏁版嵁缁勮
+ ServiceReimbursementShared serviceReimbursementShared = DtoConversionUtils.sourceToTarget(serviceReimbursement, ServiceReimbursementShared.class);
+ List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = DtoConversionUtils.sourceToTarget(details, ServiceReimbursementdetailShared.class);
+ List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds = DtoConversionUtils.sourceToTarget(serviceReimbursementpayees, ServiceReimbursementpayeeShared.class);
+ //灏嗙粍瑁呭ソ鐨勬暟鎹彃鍏ュ埌鍒嗕韩琛ㄤ腑
+ sharedService.save(serviceReimbursementShared);
+ detailSharedService.saveBatch(serviceReimbursementdetailShareds);
+ payeeSharedService.saveBatch(serviceReimbursementpayeeShareds);
+
+ return true;
+ }
+
+ @Override
public List<ServiceReimbursement> selectSearchList(ServiceReimbursementDto serviceReimbursementdto) {
return serviceReimbursementMapper.selectSearchList(serviceReimbursementdto);
}
@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) {
+ return serviceReimbursementMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE);
}
@Override
@@ -108,8 +153,8 @@
}
@Override
- public List<ServiceReimbursementEo> getRDInfoByItem(ServiceReimbursementEo serviceReimbursementEo){
- return serviceReimbursementMapper.getRDInfoByItem(serviceReimbursementEo);
+ public List<ServiceReimbursementEo> getRDInfoByItem(ServiceReimbursementEo serviceReimbursementEo) {
+ return serviceReimbursementMapper.getRDInfoByItem(serviceReimbursementEo);
}
--
Gitblit v1.9.3