From 39405c053391f29d2f2c0e2c3104bea111e0e460 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 08 五月 2024 10:25:31 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 792 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 688 insertions(+), 104 deletions(-) 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 d7f68f4..75ca769 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 @@ -1,34 +1,51 @@ package com.ruoyi.project.service.impl; -import java.util.ArrayList; -import java.util.List; - -import com.ruoyi.project.domain.BaseExpertfeetype; -import com.ruoyi.project.domain.ServiceFunddetail; -import com.ruoyi.project.domain.ServiceReimbursement; -import com.ruoyi.project.domain.vo.*; -import com.ruoyi.project.mapper.BaseExpertfeetypeMapper; -import com.ruoyi.project.mapper.ServiceFunddetailMapper; -import com.ruoyi.project.mapper.ServiceReimbursementMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; 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.config.RuoYiConfig; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.exception.base.BaseException; +import com.ruoyi.common.utils.HttpClientKit; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.project.mapper.ServiceFundMapper; -import com.ruoyi.project.domain.ServiceFund; -import com.ruoyi.project.service.IServiceFundService; +import com.ruoyi.common.utils.bean.DtoConversionUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.project.domain.*; +import com.ruoyi.project.domain.vo.*; +import com.ruoyi.project.mapper.*; +import com.ruoyi.project.service.*; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.ibatis.annotations.Param; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFColor; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; /** * 璐圭敤鐢宠涓籗ervice涓氬姟灞傚鐞� - * + * * @author ruoyi * @date 2022-01-24 */ +@Slf4j @Service -public class ServiceFundServiceImpl extends ServiceImpl<ServiceFundMapper, ServiceFund> implements IServiceFundService -{ +public class ServiceFundServiceImpl extends ServiceImpl<ServiceFundMapper, ServiceFund> implements IServiceFundService { @Autowired ServiceFundMapper serviceFundMapper; @@ -41,41 +58,91 @@ @Autowired ServiceReimbursementMapper serviceReimbursementMapper; + @Autowired + IServiceFundSharedService sharedService; + + @Autowired + ServiceFundSharedMapper serviceFundSharedMapper; + + @Autowired + ServiceFunddetailSharedMapper sharedMapper; + + @Autowired + IServiceFunddetailSharedService detailSharedService; + + @Autowired + private IServiceFunddetailService serviceFunddetailService; + + @Autowired + private VExpertfeeExpertMapper vExpertfeeExpertMapper; + + @Autowired + private VExpertfeeDonorMapper vExpertfeeDonorMapper; + + @Autowired + private VExpertfeeTotalMapper vExpertfeeTotalMapper; /** - * 鏌ヨ璐圭敤鐢宠涓诲垪琛� - * + * 鏌ヨ璐圭敤鐢宠涓诲垪琛�(鍖呭惈鍒犻櫎鐨�) + * * @param serviceFund 璐圭敤鐢宠涓� * @return 璐圭敤鐢宠涓� */ @Override public List<ServiceFund> queryList(ServiceFund serviceFund) { LambdaQueryWrapper<ServiceFund> wrappers = Wrappers.lambdaQuery(); - if (StringUtils.isNotBlank(serviceFund.getDonorno())){ - wrappers.eq(ServiceFund::getDonorno ,serviceFund.getDonorno()); + if (StringUtils.isNotBlank(serviceFund.getDonorno())) { + wrappers.eq(ServiceFund::getDonorno, serviceFund.getDonorno()); } - if (StringUtils.isNotBlank(serviceFund.getUserno())){ - wrappers.eq(ServiceFund::getUserno ,serviceFund.getUserno()); + if (serviceFund.getId() != null) { + wrappers.eq(ServiceFund::getId, serviceFund.getId()); } - if (StringUtils.isNotBlank(serviceFund.getUsername())){ - wrappers.like(ServiceFund::getUsername ,serviceFund.getUsername()); + if (serviceFund.getFundTaxId() != null) { + wrappers.eq(ServiceFund::getFundTaxId, serviceFund.getFundTaxId()); } - if (StringUtils.isNotBlank(serviceFund.getApplytype())){ - wrappers.eq(ServiceFund::getApplytype ,serviceFund.getApplytype()); + if (StringUtils.isNotBlank(serviceFund.getUserno())) { + wrappers.eq(ServiceFund::getUserno, serviceFund.getUserno()); } - if (StringUtils.isNotBlank(serviceFund.getDeptmentname())){ - wrappers.like(ServiceFund::getDeptmentname ,serviceFund.getDeptmentname()); + if (StringUtils.isNotBlank(serviceFund.getUsername())) { + wrappers.like(ServiceFund::getUsername, serviceFund.getUsername()); } - if (serviceFund.getRecordstatus()!= null){ - wrappers.eq(ServiceFund::getRecordstatus ,serviceFund.getRecordstatus()); + if (StringUtils.isNotBlank(serviceFund.getApplytype())) { + wrappers.eq(ServiceFund::getApplytype, serviceFund.getApplytype()); } - if (StringUtils.isNotBlank(serviceFund.getUploadflag())){ - wrappers.eq(ServiceFund::getUploadflag ,serviceFund.getUploadflag()); + if (StringUtils.isNotBlank(serviceFund.getDeptmentname())) { + wrappers.like(ServiceFund::getDeptmentname, serviceFund.getDeptmentname()); } - if (serviceFund.getUploadtime() != null){ - wrappers.eq(ServiceFund::getUploadtime ,serviceFund.getUploadtime()); + if (serviceFund.getRecordstatus() != null) { + wrappers.eq(ServiceFund::getRecordstatus, serviceFund.getRecordstatus()); } + if (StringUtils.isNotBlank(serviceFund.getUploadflag())) { + wrappers.eq(ServiceFund::getUploadflag, serviceFund.getUploadflag()); + } + if (serviceFund.getUploadtime() != null) { + wrappers.eq(ServiceFund::getUploadtime, serviceFund.getUploadtime()); + } + if (serviceFund.getUploadStates() != null) { + wrappers.eq(ServiceFund::getUploadStates, serviceFund.getUploadStates()); + } + if (serviceFund.getFlowlevel() != null) { + wrappers.eq(ServiceFund::getFlowlevel, serviceFund.getFlowlevel()); + } + if (serviceFund.getJxrq() != null) { + wrappers.eq(ServiceFund::getJxrq, serviceFund.getJxrq()); + } + return this.list(wrappers); + } + + + @Override + public List<ServiceFund> queryInfoById(ServiceFund serviceFund) { + LambdaQueryWrapper<ServiceFund> wrappers = Wrappers.lambdaQuery(); + if (serviceFund.getId() != null) { + wrappers.eq(ServiceFund::getId, serviceFund.getId()); + } + + wrappers.eq(ServiceFund::getDel_flag, "0"); return this.list(wrappers); } @@ -85,20 +152,69 @@ } - @Override public Long getFundId(Long infoid) { return serviceFundMapper.getFundId(infoid); } @Override - public List<ServiceFund> selectServiceFundList(ServiceFund serviceFund) { - return serviceFundMapper.selectServiceFundList(serviceFund); + @Transactional(rollbackFor = Exception.class) + public Boolean addFundSharedInfo(Long id) { + log.info("fund琛ㄧ殑id锛歿}", id); + //鍒ゆ柇涓�涓嬶紝share琛ㄦ槸鍚﹀凡缁忓瓨鍦ㄤ簡 + Map<String, Object> map = new HashMap<>(); + map.put("serfunid", id); + map.put("del_flag", 0); + List<ServiceFundShared> serviceFundSharedList = serviceFundSharedMapper.selectByMap(map); + if (!CollectionUtils.isEmpty(serviceFundSharedList)) { + return true; + } + + ServiceFund serviceFund = serviceFundMapper.selectById(id); + ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class); + serviceFundShared.setSerfunid(serviceFundShared.getId()); + serviceFundShared.setId(null); + log.info("鏁版嵁閮芥彃杩涘幓浜嗗悧锛� {}", serviceFundShared); + sharedService.save(serviceFundShared); + + //fundId涓轰富琛ㄧ殑ID + Map<String, Object> columnMap = new HashMap<>(); + columnMap.put("fundid", id); + List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.selectByMap(columnMap); + //灏嗘煡鍑虹殑鏁版嵁鏀惧埌ServiceFunddetailShared涓� + List<ServiceFunddetailShared> serviceFunddetailShareds = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailShared.class); + for (int i = 0; i < serviceFunddetails.size(); i++) { + serviceFunddetailShareds.get(i).setFdid(serviceFunddetailShareds.get(i).getId()); + //fundID涓簊ervice_fund_shared琛ㄧ殑涓婚敭ID + serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId()); + serviceFunddetailShareds.get(i).setId(null); + //鏁版嵁鍙戦�佺粰璐㈠姟 + try { + uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i)); + } catch (Exception e) { + e.printStackTrace(); + log.error("Exception涓叆鍙傜殑ID涓猴細{},寮傚父淇℃伅涓� 锛� {}", id, e.getMessage()); + if (id != null) { + Boolean aBoolean = sharedService.delfundsharedInfoById(null, id); + log.error("fund2鍒嗕韩琛ㄩ噷鐨勬暟鎹槸鍚﹀垹闄ゆ垚鍔燂細{}", aBoolean); + } + return false; + } + } + boolean result = false; + for (ServiceFunddetailShared serviceFunddetailShared : serviceFunddetailShareds) { + if (ObjectUtils.isNotEmpty(serviceFunddetailShared)) { + result = detailSharedService.save(serviceFunddetailShared); + } else { + log.info("serviceFunddetailShared涓虹┖浜嗭紒锛侊紒"); + } + } + return result; } @Override - public List<ServiceFunddetail> getFundDetail(Long id) { - return serviceFunddetailMapper.selectFundDetailListById(id); + public List<ServiceFund> selectServiceFundList(ServiceFund serviceFund) { + return serviceFundMapper.selectServiceFundList(serviceFund); } @Override @@ -133,9 +249,9 @@ List<ServiceFund> serviceFunds = serviceFundMapper.getInfoByInfoId(infoid); List<ServiceFunddetail> fd = new ArrayList<>(); - for(ServiceFund s : serviceFunds){ + for (ServiceFund s : serviceFunds) { List<ServiceFunddetail> l = serviceFunddetailMapper.getAllDetailsByFDIDHZ(s.getId()); - for(ServiceFunddetail df : l){ + for (ServiceFunddetail df : l) { fd.add(df); } } @@ -251,225 +367,223 @@ double sh52 = 0; double shhj = 0; - for(ServiceReimbursement sr : serviceReimbursements1){ + for (ServiceReimbursement sr : serviceReimbursements1) { f28 += sr.getAmountrequested(); sh28 += sr.getAmountrequested(); } - for(ServiceReimbursement sr : serviceReimbursements2){ + for (ServiceReimbursement sr : serviceReimbursements2) { f51 += sr.getAmountrequested(); sh51 += sr.getAmountrequested(); } - for(ServiceFunddetail s : fd){ - if(s.getItemid() == 1){ + for (ServiceFunddetail s : fd) { + if (s.getItemid() == 1) { f1 += s.getAmount(); sh1 += s.getTaxedamount(); } - if(s.getItemid() == 2){ + if (s.getItemid() == 2) { f2 += s.getAmount(); sh2 += s.getTaxedamount(); } - if(s.getItemid() == 3){ + if (s.getItemid() == 3) { f3 += s.getAmount(); sh3 += s.getTaxedamount(); } - if(s.getItemid() == 4){ + if (s.getItemid() == 4) { f4 += s.getAmount(); sh4 += s.getTaxedamount(); } - if(s.getItemid() == 5){ + if (s.getItemid() == 5) { f5 += s.getAmount(); sh5 += s.getTaxedamount(); } - if(s.getItemid() == 6){ + if (s.getItemid() == 6) { f6 += s.getAmount(); sh6 += s.getTaxedamount(); } - if(s.getItemid() == 7){ + if (s.getItemid() == 7) { f7 += s.getAmount(); sh7 += s.getTaxedamount(); } - if(s.getItemid() == 8){ + if (s.getItemid() == 8) { f8 += s.getAmount(); sh8 += s.getTaxedamount(); } - if(s.getItemid() == 9){ + if (s.getItemid() == 9) { f9 += s.getAmount(); sh9 += s.getTaxedamount(); } - if(s.getItemid() == 10){ + if (s.getItemid() == 10) { f10 += s.getAmount(); sh10 += s.getTaxedamount(); } - if(s.getItemid() == 11){ + if (s.getItemid() == 11) { f11 += s.getAmount(); sh11 += s.getTaxedamount(); } - if(s.getItemid() == 12){ + if (s.getItemid() == 12) { f12 += s.getAmount(); sh12 += s.getTaxedamount(); } - if(s.getItemid() == 13){ + if (s.getItemid() == 13) { f13 += s.getAmount(); sh13 += s.getTaxedamount(); } - if(s.getItemid() == 14){ + if (s.getItemid() == 14) { f14 += s.getAmount(); sh14 += s.getTaxedamount(); } - if(s.getItemid() == 15){ + if (s.getItemid() == 15) { f15 += s.getAmount(); sh15 += s.getTaxedamount(); } - if(s.getItemid() == 16){ + if (s.getItemid() == 16) { f16 += s.getAmount(); sh16 += s.getTaxedamount(); } - if(s.getItemid() == 17){ + if (s.getItemid() == 17) { f17 += s.getAmount(); sh17 += s.getTaxedamount(); } - if(s.getItemid() == 18){ + if (s.getItemid() == 18) { f18 += s.getAmount(); sh18 += s.getTaxedamount(); } - if(s.getItemid() == 19){ + if (s.getItemid() == 19) { f19 += s.getAmount(); sh19 += s.getTaxedamount(); } - if(s.getItemid() == 20){ + if (s.getItemid() == 20) { f20 += s.getAmount(); sh20 += s.getTaxedamount(); } - if(s.getItemid() == 21){ + if (s.getItemid() == 21) { f21 += s.getAmount(); sh21 += s.getTaxedamount(); } - if(s.getItemid() == 22){ + if (s.getItemid() == 22) { f22 += s.getAmount(); sh22 += s.getTaxedamount(); } - if(s.getItemid() == 23){ + if (s.getItemid() == 23) { f23 += s.getAmount(); sh23 += s.getTaxedamount(); } - if(s.getItemid() == 24){ + if (s.getItemid() == 24) { f24 += s.getAmount(); sh24 += s.getTaxedamount(); } - if(s.getItemid() == 25){ + if (s.getItemid() == 25) { f25 += s.getAmount(); sh25 += s.getTaxedamount(); } - if(s.getItemid() == 26){ + if (s.getItemid() == 26) { f26 += s.getAmount(); sh26 += s.getTaxedamount(); } - if(s.getItemid() == 27){ + if (s.getItemid() == 27) { f27 += s.getAmount(); sh27 += s.getTaxedamount(); } - if(s.getItemid() == 29){ + if (s.getItemid() == 29) { f29 += s.getAmount(); sh29 += s.getTaxedamount(); } - if(s.getItemid() == 30){ + if (s.getItemid() == 30) { f30 += s.getAmount(); sh30 += s.getTaxedamount(); } - if(s.getItemid() == 31){ + if (s.getItemid() == 31) { f31 += s.getAmount(); sh31 += s.getTaxedamount(); } - if(s.getItemid() == 32){ + if (s.getItemid() == 32) { f32 += s.getAmount(); sh32 += s.getTaxedamount(); } - if(s.getItemid() == 33){ + if (s.getItemid() == 33) { f33 += s.getAmount(); sh33 += s.getTaxedamount(); } - if(s.getItemid() == 34){ + if (s.getItemid() == 34) { f34 += s.getAmount(); sh34 += s.getTaxedamount(); } - if(s.getItemid() == 35){ + if (s.getItemid() == 35) { f35 += s.getAmount(); sh35 += s.getTaxedamount(); } - if(s.getItemid() == 36){ + if (s.getItemid() == 36) { f36 += s.getAmount(); sh36 += s.getTaxedamount(); } - if(s.getItemid() == 37){ + if (s.getItemid() == 37) { f37 += s.getAmount(); sh37 += s.getTaxedamount(); } - if(s.getItemid() == 38){ + if (s.getItemid() == 38) { f38 += s.getAmount(); sh38 += s.getTaxedamount(); } - if(s.getItemid() == 39){ + if (s.getItemid() == 39) { f39 += s.getAmount(); sh39 += s.getTaxedamount(); } - if(s.getItemid() == 40){ + if (s.getItemid() == 40) { f40 += s.getAmount(); sh40 += s.getTaxedamount(); } - if(s.getItemid() == 41){ + if (s.getItemid() == 41) { f41 += s.getAmount(); sh41 += s.getTaxedamount(); } - if(s.getItemid() == 42){ + if (s.getItemid() == 42) { f42 += s.getAmount(); sh42 += s.getTaxedamount(); } - if(s.getItemid() == 43){ + if (s.getItemid() == 43) { f43 += s.getAmount(); sh43 += s.getTaxedamount(); } - if(s.getItemid() == 44){ + if (s.getItemid() == 44) { f44 += s.getAmount(); sh44 += s.getTaxedamount(); } - if(s.getItemid() == 45){ + if (s.getItemid() == 45) { f45 += s.getAmount(); sh45 += s.getTaxedamount(); } - if(s.getItemid() == 46){ + if (s.getItemid() == 46) { f46 += s.getAmount(); sh46 += s.getTaxedamount(); } - if(s.getItemid() == 47){ + if (s.getItemid() == 47) { f47 += s.getAmount(); sh47 += s.getTaxedamount(); } - if(s.getItemid() == 48){ + if (s.getItemid() == 48) { f48 += s.getAmount(); sh48 += s.getTaxedamount(); } - if(s.getItemid() == 49){ + if (s.getItemid() == 49) { f49 += s.getAmount(); sh49 += s.getTaxedamount(); } - if(s.getItemid() == 50){ + if (s.getItemid() == 50) { f50 += s.getAmount(); sh50 += s.getTaxedamount(); } - if(s.getItemid() == 52){ + if (s.getItemid() == 52) { f52 += s.getAmount(); sh52 += s.getTaxedamount(); } } - hj = f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + f10 + f11 + f12 + f13 + f14 + f15 + f16 + f17 + f18 + f19 + f20 + f21 + f22 + f23 + f24 + f25 + f26 + f27 + f28 + f29 + f30 + f31 + f32 + f33 + f34 + f35 - + f36 + f37 + f38 + f39 + f40 + f41 + f42 + f43 + f44 + f45 + f46 + f47 + f48 + f49 + f50 + f51 + f52; + hj = f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + f10 + f11 + f12 + f13 + f14 + f15 + f16 + f17 + f18 + f19 + f20 + f21 + f22 + f23 + f24 + f25 + f26 + f27 + f28 + f29 + f30 + f31 + f32 + f33 + f34 + f35 + f36 + f37 + f38 + f39 + f40 + f41 + f42 + f43 + f44 + f45 + f46 + f47 + f48 + f49 + f50 + f51 + f52; - shhj = sh1 + sh2 + sh3 + sh4 + sh5 + sh6 + sh7 + sh8 + sh9 + sh10 + sh11 + sh12 + sh13 + sh14 + sh15 + sh16 + sh17 + sh18 + sh19 + sh20 + sh21 + sh22 + sh23 + sh24 + sh25 + sh26 + sh27 + sh28 + sh29 + sh30 + sh31 + sh32 + sh33 + sh34 + sh35 - + sh36 + sh37 + sh38 + sh39 + sh40 + sh41 + sh42 + sh43 + sh44 + sh45 + sh46 + sh47 + sh48 + sh49 + sh50 + sh51 + sh52; + shhj = sh1 + sh2 + sh3 + sh4 + sh5 + sh6 + sh7 + sh8 + sh9 + sh10 + sh11 + sh12 + sh13 + sh14 + sh15 + sh16 + sh17 + sh18 + sh19 + sh20 + sh21 + sh22 + sh23 + sh24 + sh25 + sh26 + sh27 + sh28 + sh29 + sh30 + sh31 + sh32 + sh33 + sh34 + sh35 + sh36 + sh37 + sh38 + sh39 + sh40 + sh41 + sh42 + sh43 + sh44 + sh45 + sh46 + sh47 + sh48 + sh49 + sh50 + sh51 + sh52; fdvo.setFy1(f1); fdvo.setFy2(f2); @@ -588,16 +702,20 @@ } @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, String donorname) { + return serviceFundMapper.getListBypower(PAUSERNO, PAFUNDTYPE, PAAPPLICANT, PAAPPLICATIONBEGTIME, PAAPPLICATIONENDTIME, PADEPARTMENT, CHECKFLAG, APPLYTYPE, CHECKSTATUS, donorname); + } + + @Override + public List<SpFinancialExpensesFundOut> getExpertfeeList(SpSelectExpertfee spSelectExpertfee) { + return serviceFundMapper.getExpertfeeList(spSelectExpertfee.getPaApplyType(), spSelectExpertfee.getDonorname(), spSelectExpertfee.getPacheckno(), spSelectExpertfee.getCheckstatus(), spSelectExpertfee.getPadepartno(), spSelectExpertfee.getPausername()); } @Override public int countItem(Long infoid, Long itemid) { List<ServiceFund> serviceFunds = serviceFundMapper.getInfoByInfoId(infoid); - int count = 0; - for(ServiceFund s : serviceFunds){ + for (ServiceFund s : serviceFunds) { long fundid = s.getId(); int l = serviceFunddetailMapper.countItem(fundid, itemid); count += l; @@ -606,5 +724,471 @@ return count; } + @Override + @Transactional(rollbackFor = Exception.class) + public Long addOrUpdateNew(ServiceFundVO serviceFundVO) { + Long id = null; + //灏嗘暟鎹繚瀛樺埌fund琛� + serviceFundVO.setUploadStates(0); + id = saveFund(serviceFundVO); + List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails(); + + BigDecimal bigDecimal = new BigDecimal(0.0); + if (!CollectionUtils.isEmpty(serviceFunddetails)) { + + // 淇濆瓨璇︽儏鏁版嵁 + for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) { + //鍘绘帀韬唤璇佺殑棣栧熬绌烘牸 + if (StringUtils.isNotEmpty(serviceFunddetailVO.getIdcardno())) { + serviceFunddetailVO.setIdcardno(serviceFunddetailVO.getIdcardno().trim()); + } + + if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) { + throw new BaseException("璇锋鏌ラ摱琛屽崱鍙锋槸鍚︿负绌�,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname()); + } + serviceFunddetailVO.setFundid(id); + //灏囬檮浠惰浆鎴恓son + if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) { + serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList())); + } else { + serviceFunddetailVO.setAnnexfiles(null); + } + if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoicefilesList())) { + serviceFunddetailVO.setInvoicefiles(JSON.toJSONString(serviceFunddetailVO.getInvoicefilesList())); + } else { + serviceFunddetailVO.setInvoicefiles(null); + } + ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class); + + if (serviceFunddetailVO.getId() == null) { + serviceFunddetailService.save(serviceFunddetail); + } else { + serviceFunddetailService.updateById(serviceFunddetail); + } + + bigDecimal = bigDecimal.add(BigDecimal.valueOf(serviceFunddetailVO.getAmount())); + + } + } + serviceFundVO.setPretaxcost(bigDecimal.doubleValue()); + serviceFundMapper.updateById(serviceFundVO); + return id; + } + + @Override + public Map<String, Long> performance(ServiceFundVO serviceFundVO) { + Long id = null; + //灏嗘暟鎹繚瀛樺埌fund琛� + id = saveFund(serviceFundVO); + + List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails(); + if (CollectionUtils.isEmpty(serviceFunddetails)) { + System.out.println("serviceFunddetails涓虹┖鍠�"); + return null; + } + + //鎬荤◣鍓� + Double pretaxcosts = 0.00; + //鎬荤◣鍚� + Double taxedcosts = 0.00; + for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) { + serviceFunddetailVO.setFundid(id); + + ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class); + Map<String, Double> performance = serviceFunddetailService.performance(serviceFunddetail); + if (!performance.isEmpty()) { + Double amount = performance.get("amount"); + Double taxedamount = performance.get("taxedamount"); + pretaxcosts = pretaxcosts + amount; + taxedcosts = taxedcosts + taxedamount; + } + serviceFundVO.setPretaxcost(pretaxcosts); + serviceFundVO.setTaxedcost(taxedcosts); + updateById(serviceFundVO); + } + Map map = new HashMap(); + map.put("fundId", id); + return map; + } + + @Override + public Map<String, List<ServiceFunddetailExcel>> totaltax(TotalTaxVO totalTaxVO) { + if (CollectionUtils.isEmpty(totalTaxVO.getFundids())) { + throw new BaseException("璇峰嬀閫変箣鍚庯紝鍐嶈繘琛屽悎璁′釜绋�"); + } + Map<String, List<ServiceFunddetailExcel>> map = new HashMap<>(); + + if (totalTaxVO.getIsTaxAfter() == null) { + //濡備綍涓虹┖锛岄粯璁ゅ綋娌℃湁绠楄繃绋庯紝杩涜鍚堣 + totalTaxVO.setIsTaxAfter(0); + } + List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.totlaTax(totalTaxVO.getFundids()); + if (CollectionUtils.isEmpty(serviceFunddetails)) { + throw new BaseException("鏌ヨ鐨勮鎯呮暟鎹负绌�"); + } + + //鐢ㄤ簬杩斿洖excel + List<ServiceFunddetailExcel> serviceFunddetailList = new ArrayList<>(); + + if (totalTaxVO.getIsTaxAfter() == 1) { + //閫氳繃鍙楃泭浜哄悕绉帮紝灏嗙◣鍓嶃�佺◣鍚庣殑鍊肩浉鍔� + Map<String, Double> sumAmount = serviceFunddetails.stream().collect(Collectors.groupingBy(ServiceFunddetail::getBeneficiaryname, Collectors.summingDouble(ServiceFunddetail::getAmount))); + Map<String, Double> sumTaxdAmount = serviceFunddetails.stream().collect(Collectors.groupingBy(ServiceFunddetail::getBeneficiaryname, Collectors.summingDouble(ServiceFunddetail::getTaxedamount))); + + for (String key : sumAmount.keySet()) { + ServiceFunddetailExcel serviceFunddetailExcel = new ServiceFunddetailExcel(); + serviceFunddetailExcel.setAmount(sumAmount.getOrDefault(key, 0.0)); + serviceFunddetailExcel.setTaxedamount(sumTaxdAmount.getOrDefault(key, 0.0)); + for (ServiceFunddetail serviceFunddetail2 : serviceFunddetails) { + if (serviceFunddetail2.getBeneficiaryname().equals(key)) { + serviceFunddetailExcel.setIdcardno(serviceFunddetail2.getIdcardno()); + serviceFunddetailExcel.setBankcardno(serviceFunddetail2.getBankcardno()); + serviceFunddetailExcel.setBeneficiaryname(serviceFunddetail2.getBeneficiaryname()); + serviceFunddetailExcel.setDepositbank(serviceFunddetail2.getDepositbank()); + serviceFunddetailExcel.setBranchbankname(serviceFunddetail2.getBranchbankname()); + serviceFunddetailExcel.setDonorname(serviceFunddetail2.getDonorname()); + serviceFunddetailExcel.setPhone(serviceFunddetail2.getPhone()); + break; + } + } + serviceFunddetailList.add(serviceFunddetailExcel); + } + //杩斿洖绠楄繃绋庝箣鍚庣殑锛屽悎璁� + map.put("鍚堣涓◣锛堢◣鍚庯級", serviceFunddetailList); + return map; + + } else { + a: + for (ServiceFunddetail serviceFunddetail : serviceFunddetails) { + ServiceFunddetailExcel sfeBefore = new ServiceFunddetailExcel(); + ServiceFunddetailExcel sfeAfter = new ServiceFunddetailExcel(); + + for (ServiceFunddetailExcel serviceFunddetailExcel : serviceFunddetailList) { + //鍒ゆ柇涓�涓嬶紝璇ュ彈鐩婁汉鏄惁宸茬粡璁$畻杩囷紝宸茬粡璁$畻杩囦簡锛屽氨涓嶇畻浜� + if (serviceFunddetail.getBeneficiaryname().trim().equals(serviceFunddetailExcel.getBeneficiaryname().trim())) { + continue a; + } + } + + + for (ServiceFunddetail serviceFunddetail2 : serviceFunddetails) { + if (StringUtils.isEmpty(serviceFunddetail2.getServicesscopename())) { + ServiceFund serviceFund = null; + if (serviceFunddetail2.getFundid() == null) { + serviceFund = serviceFundMapper.selectById(serviceFunddetail2.getFundid()); + } + throw new BaseException("鏈嶅姟璇存槑涓虹┖,璇锋鏌ュ悗鍐嶈绠�,鎹愮尞鑰呬负 :" + serviceFund.getDonorname()); + } + if (serviceFunddetail.getBeneficiaryname().equals(serviceFunddetail2.getBeneficiaryname()) && !(serviceFunddetail2.getServicesscopename().equals("绋庡悗"))) { + //绱绋庡墠 + sfeBefore.setIdcardno(serviceFunddetail2.getIdcardno()); + sfeBefore.setBankcardno(serviceFunddetail2.getBankcardno()); + sfeBefore.setBeneficiaryname(serviceFunddetail2.getBeneficiaryname()); + sfeBefore.setDepositbank(serviceFunddetail2.getDepositbank()); + sfeBefore.setBranchbankname(serviceFunddetail2.getBranchbankname()); + sfeBefore.setDonorname(serviceFunddetail2.getDonorname()); + sfeBefore.setPhone(serviceFunddetail2.getPhone()); + if (sfeBefore.getAmount() == null) { + sfeBefore.setAmount(serviceFunddetail2.getAmount()); + } else { + sfeBefore.setAmount(sfeBefore.getAmount() + serviceFunddetail2.getAmount()); + } + sfeBefore.setTaxedamount(null); + + } else if (serviceFunddetail.getBeneficiaryname().equals(serviceFunddetail2.getBeneficiaryname()) && serviceFunddetail2.getServicesscopename().equals("绋庡悗")) { + //绱绋庡悗 + sfeAfter.setIdcardno(serviceFunddetail2.getIdcardno()); + sfeAfter.setBankcardno(serviceFunddetail2.getBankcardno()); + sfeAfter.setBeneficiaryname(serviceFunddetail2.getBeneficiaryname()); + sfeAfter.setDepositbank(serviceFunddetail2.getDepositbank()); + sfeAfter.setBranchbankname(serviceFunddetail2.getBranchbankname()); + sfeAfter.setDonorname(serviceFunddetail2.getDonorname()); + sfeAfter.setPhone(serviceFunddetail2.getPhone()); + sfeAfter.setAmount(null); + if (sfeAfter.getTaxedamount() == null) { + sfeAfter.setTaxedamount(serviceFunddetail2.getTaxedamount()); + } else { + sfeAfter.setTaxedamount(sfeAfter.getTaxedamount() + serviceFunddetail2.getTaxedamount()); + } + } + + } + //灏嗚绠楀ソ鐨勭◣鍓嶆�诲�笺�佺◣鍚庢�诲�硷紝鏀惧埌List涓� + if (ObjectUtils.isNotEmpty(sfeBefore.getBeneficiaryname())) serviceFunddetailList.add(sfeBefore); + + if (ObjectUtils.isNotEmpty(sfeAfter.getBeneficiaryname())) serviceFunddetailList.add(sfeAfter); + + } + //杩斿洖绠楃◣涔嬪墠鐨勶紝鍚堣 + map.put("鍚堣涓◣锛堢◣鍓嶏級", serviceFunddetailList); + return map; + } + } + + @Override + public Map<String, Object> exportFeeSum(Integer faxId) { + List<VExpertfeeTotal> list = vExpertfeeTotalMapper.selectVExpertfeeTotalListByTaxId(faxId); + ExcelUtil<VExpertfeeTotal> util = new ExcelUtil<VExpertfeeTotal>(VExpertfeeTotal.class); + AjaxResult ajaxResult = util.exportExcel(list, "vExpertfeeTotal"); + String filePath = RuoYiConfig.getDownloadPath() + ajaxResult.get("msg"); + + List<VExpertfeeDonor> list2 = vExpertfeeDonorMapper.selectVExpertfeeDonorList2(faxId); + ExcelUtil<VExpertfeeDonor> util2= new ExcelUtil<VExpertfeeDonor>(VExpertfeeDonor.class); + AjaxResult ajaxResult2 = util2.exportExcel(list2, "VExpertfeeDonor"); + + List<VExpertfeeExpert> list3 = vExpertfeeExpertMapper.selectVExpertfeeExpertListByFaxId(faxId); + ExcelUtil<VExpertfeeExpert> util3 = new ExcelUtil<VExpertfeeExpert>(VExpertfeeExpert.class); + AjaxResult ajaxResult3 = util3.exportExcel(list3, "vExpertfeeExpert"); + + List<String> list1 = new ArrayList<>(); + list1.add(ajaxResult.get("msg").toString()); + list1.add(ajaxResult2.get("msg").toString()); + list1.add(ajaxResult3.get("msg").toString()); + + + String name = "涓撳璐规眹鎬诲崟" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xlsx"; + mergeExcel(list1, RuoYiConfig.getDownloadPath() + name); + for (String path : list1) { + new File(RuoYiConfig.getDownloadPath() + path).delete(); + } + Map<String, Object> map = new HashMap<>(); + map.put("downloadUrl", "/profile/download/" + name); + map.put("downloadName", name); + return map; + } + + + int uploadOAFileAndUpdateDb(ServiceFunddetailShared remShare) throws Exception { + //涓婁紶OA鏂囦欢 + //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3"; + String strUrl = "http://129.88.242.39:8899/seeyon/rest/token"; + //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token"; + //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴� + Map<String, Object> map = new HashMap<String, Object>(); + map.put("userName", "opo"); + map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5"); + map.put("loginName", "demo3"); + + JSONObject jsonObj = new JSONObject(map); + + System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString()); + String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());// + //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//寰楀埌杩斿洖鐨則oken? + + JSONObject json1 = JSONObject.parseObject(strRes); + strRes = json1.get("id").toString(); + + String filePath = RuoYiConfig.getUploadPath(); + String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes; + List<RbDetailFile> parseArray2 = new ArrayList<>(); + List<RbDetailFile> invoicefilesList = new ArrayList<>(); + + //鏅�氶檮浠� + List<RbDetailFile> parseArray = JSON.parseArray(remShare.getAnnexfiles(), RbDetailFile.class); + //鍙戠エ闄勪欢 + List<RbDetailFile> invoicefilesArray = JSON.parseArray(remShare.getInvoicefiles(), RbDetailFile.class); + log.info("parseArray鐨勫�� : {}, invoicefilesArray鐨勫�� : {},", parseArray, invoicefilesArray); + + //鏅�氶檮浠� + uploadFile(filePath, strFUrl, parseArray2, parseArray, remShare, "1"); + + //鍙戠エ闄勪欢 + uploadFile(filePath, strFUrl, invoicefilesList, invoicefilesArray, remShare, "2"); + return 0; + } + + + private Integer uploadFile(String filePath, String strFUrl, List<RbDetailFile> parseArray2, List<RbDetailFile> parseArray, ServiceFunddetailShared remShare, String flag) throws Exception { + if (!CollectionUtils.isEmpty(parseArray)) { + for (int i = 0; i < parseArray.size(); i++) { + RbDetailFile rbDetailFile = parseArray.get(i); + log.info("filePath鐨勪慨鏀�:{}", filePath); + String url = rbDetailFile.getUrl(); + //file鐢ㄧ殑鏄粷瀵逛綅缃� + String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length()); +// String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload"); + System.out.println("fund鏈嶅姟鐨刦ilePath + substring: " + filePath + substring); + File filetest = new File(filePath + substring); + + String struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl); + log.info("绗笁鏂逛紶鍥炵殑鏁版嵁: {}", struploadResult); + if (StringUtils.isEmpty(struploadResult)) { + log.error("HttpClientKit.sendPostWithFile 璇锋眰涓虹┖浜� filetest:{}, strFUrl:{} ", filetest, strFUrl); + return 0; + } + //鑾峰彇fileid + JSONObject jsonR = JSONObject.parseObject(struploadResult); + JSONArray jsonArr = jsonR.getJSONArray("atts"); + log.info("绗笁鏂逛紶鍥炵殑鏁版嵁鑾峰彇鐨刟tts : {}", jsonArr); + for (int j = 0; j < jsonArr.size(); j++) { + JSONObject jsonRet = jsonArr.getJSONObject(j); + if (StringUtils.isEmpty(jsonRet.get("fileUrl").toString())) { + throw new BaseException("fileID涓虹┖,璇疯仈绯荤涓夋柟澶勭悊"); + } + rbDetailFile.setFileid(jsonRet.get("fileUrl").toString()); + } + + parseArray2.add(rbDetailFile); + } + if (flag.equals("1")) { + //濡傛灉flag涓�1,鍒欐槸鏅�� + remShare.setAnnexfiles(JSON.toJSONString(parseArray2)); + } else if (flag.equals("2")) { + //濡傛灉flag涓�2,鍒欐槸鍙戠エ + remShare.setInvoicefiles(JSON.toJSONString(parseArray2)); + } + log.info("ServiceReimbursementdetailShared 鏄惁鍔犱笂浜唂ileid : {}", remShare); + } + return 0; + } + +// int uploadOAFileAndUpdateDb(ServiceFundShared remShare) { +// //涓婁紶OA鏂囦欢 +// //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3"; +// String strUrl = "http://129.88.242.39:8899/seeyon/rest/token"; +// //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token"; +// //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴� +// +// +// Map<String, Object> map = new HashMap<String, Object>(); +// map.put("userName", "opo"); +// map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5"); +// map.put("loginName", "demo3"); +// +// JSONObject jsonObj = new JSONObject(map); +// +// System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString()); +// String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());// +// //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//寰楀埌杩斿洖鐨則oken? +// +// JSONObject json1 = JSONObject.parseObject(strRes); +// strRes = json1.get("id").toString(); +// +// ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠h〃澶辫触 +// +// //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁 +// +// String filePath = RuoYiConfig.getUploadPath(); +// String strMutfileUrl = remShare.getAnnexbankcard();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑 +// +// String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes; +// //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes; +// //strFUrl = String.format(strFUrl, strRes); +// +// /*File test = null; +// File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17"); +// if (file.exists() && file.isDirectory()) { +// // 鑾峰彇鎵�鏈夌洸鐩掓枃浠跺す +// File[] ones = file.listFiles(); +// for (File one : ones) { +// test = one; +// } +// }*/ +// +// String filename = ""; +// String fileid = ""; +// +// String[] urlArray = strMutfileUrl.split(","); +// for (int i = 0; i < urlArray.length; i++) { +// String strOneFileName = urlArray[i]; +// String strTemp = strOneFileName.substring(15); +// String strFile = filePath + strTemp; +// //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName); +// String struploadResult = ""; +// File filetest = new File(strFile); +// try { +// struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// +// +// //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj); +// if (struploadResult == null) return 0; +// if (struploadResult.isEmpty()) return 0; +// +// JSONObject jsonR = JSONObject.parseObject(struploadResult); +// +// JSONArray jsonArr = jsonR.getJSONArray("atts"); +// for (int j = 0; j < jsonArr.size(); j++) { +// JSONObject jsonRet = jsonArr.getJSONObject(j); +// String name1 = jsonRet.get("filename").toString(); +// String id1 = jsonRet.get("fileUrl").toString(); +// filename += name1; +// fileid += id1; +// if (i != urlArray.length - 1) { +// filename += ","; +// fileid += ","; +// } +// } +// +// } +// +// long nId = remShare.getId(); +// remShare.setId(nId); +// remShare.setFilename(filename); +// remShare.setFileid(fileid); +// boolean bRet = sharedService.updateById(remShare); +// if (!bRet) return -1; +// +// return 0; +// } + + public long saveFund(ServiceFundVO serviceFundVO) { + Long id = null; + //灏嗘暟鎹繚瀛樺埌fund琛� + if (ObjectUtils.isNotEmpty(serviceFundVO) && serviceFundVO.getId() == null) { + serviceFundVO.setCheckstatus(serviceFundVO.getCheckstatus() == null ? 1 : 2); + save(serviceFundVO); + id = serviceFundVO.getId(); + } else { + updateById(serviceFundVO); + id = serviceFundVO.getId(); + } + return id; + } + + public void mergeExcel(List<String> files, String outputFile) { + try { + Workbook resultWorkbook = new XSSFWorkbook(); + for (String file : files) { + InputStream is1 = new FileInputStream(RuoYiConfig.getDownloadPath() + file); + Workbook workbook1 = new XSSFWorkbook(is1); + Sheet sheet1 = workbook1.getSheetAt(0); + // 澶嶅埗绗竴涓枃浠剁殑Sheet + Sheet newSheet1 = resultWorkbook.createSheet(file.substring(0, file.indexOf("."))); + for (Row row : sheet1) { + Row newRow = newSheet1.createRow(row.getRowNum()); + int columns = row.getLastCellNum(); + for (int i = 0; i < columns; i++) { + newSheet1.setColumnWidth(i, 5000); + Cell cell = row.getCell(i); + Cell newCell = newRow.createCell(cell.getColumnIndex()); + newCell.setCellValue(cell.getStringCellValue()); + // 鍒涘缓鍗曞厓鏍兼牱寮� + CellStyle style = resultWorkbook.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); // 姘村钩灞呬腑 + style.setVerticalAlignment(VerticalAlignment.CENTER); // 鍨傜洿灞呬腑 + if (row.getRowNum() == 0) { + // 璁剧疆绗竴琛岃儗鏅壊 + style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + } + + newCell.setCellStyle(style); + } + } + } + FileOutputStream out = new FileOutputStream(outputFile); + resultWorkbook.write(out); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Transactional(rollbackFor = Exception.class) + public Boolean updateFundTaxIdById(Long id, Long fundTaxId) { + return serviceFundMapper.updateFundTaxIdById(id, fundTaxId); + } } -- Gitblit v1.9.3