From d6f2f458d9c8156981880c987d861423ce9af146 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 14 六月 2023 16:42:08 +0800 Subject: [PATCH] 修改类型 --- ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 123 +++++++++++++++++++++++++++++++--------- 1 files changed, 94 insertions(+), 29 deletions(-) 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 6a5da46..f5ea118 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,33 +1,36 @@ 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.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; +import org.springframework.transaction.annotation.Transactional; /** * 鎶ラ攢鐢宠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; @@ -35,38 +38,56 @@ @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){ @@ -87,13 +108,51 @@ } @Override + @Transactional + 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); + serviceReimbursementShared.setReimid(id); + serviceReimbursementShared.setId(null); + List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = DtoConversionUtils.sourceToTarget(details, ServiceReimbursementdetailShared.class); + List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds = DtoConversionUtils.sourceToTarget(serviceReimbursementpayees, ServiceReimbursementpayeeShared.class); + //灏嗙粍瑁呭ソ鐨勬暟鎹彃鍏ュ埌鍒嗕韩琛ㄤ腑 + sharedService.save(serviceReimbursementShared); + + //灏唖erviceReimbursementdetail琛ㄩ噷鐨刬d璧嬪�肩粰Rdid; 灏唖erviceReimbursementShared閲岀殑ID璧嬪�肩粰RBID,骞跺皢serviceReimbursementdetailShared琛ㄩ噷鐨刬d缃┖锛岀敱鏁版嵁搴撻噸鏂扮敓鎴� + for (int i = 0; i < details.size(); i++) { + serviceReimbursementdetailShareds.get(i).setRdid(serviceReimbursementdetailShareds.get(i).getId()); + serviceReimbursementdetailShareds.get(i).setRbid(serviceReimbursementShared.getId()); + serviceReimbursementdetailShareds.get(i).setId(null); + } + detailSharedService.saveBatch(serviceReimbursementdetailShareds); + + //灏唖erviceReimbursementpayee琛ㄩ噷鐨刬d璧嬪�肩粰Rpid; 灏唖erviceReimbursementShared閲岀殑ID璧嬪�肩粰RBID,骞跺皢serviceReimbursementpayeeShared琛ㄩ噷鐨刬d缃┖锛岀敱鏁版嵁搴撻噸鏂扮敓鎴� + for (int i = 0; i < serviceReimbursementpayees.size(); i++) { + serviceReimbursementpayeeShareds.get(i).setRpid(Long.valueOf(serviceReimbursementpayees.get(i).getId())); + serviceReimbursementpayeeShareds.get(i).setRbid(serviceReimbursementShared.getId()); + serviceReimbursementpayeeShareds.get(i).setId(null); + } + 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 @@ -106,4 +165,10 @@ return serviceReimbursementMapper.getInfoByInfoIdRelatives(infoid); } + @Override + public List<ServiceReimbursementEo> getRDInfoByItem(ServiceReimbursementEo serviceReimbursementEo) { + return serviceReimbursementMapper.getRDInfoByItem(serviceReimbursementEo); + } + + } -- Gitblit v1.9.3