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/resources/mapper/project/VExpertfeeDonorMapper.xml | 62 ++++++++++ ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 12 +- ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeDonorMapper.java | 27 ++++ ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeDonorServiceImpl.java | 70 +++++++++++ ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeDonor.java | 85 ++++++++++++++ ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 22 ++ ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 3 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java | 3 ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeDonorService.java | 24 ++++ 9 files changed, 295 insertions(+), 13 deletions(-) diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeDonor.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeDonor.java new file mode 100644 index 0000000..c389504 --- /dev/null +++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VExpertfeeDonor.java @@ -0,0 +1,85 @@ +package com.ruoyi.project.domain; + +import java.math.BigDecimal; +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; + +/** + * VIEW瀵硅薄 v_expertfee_donor + * + * @author ruoyi + * @date 2024-05-08 + */ +@Data +@ApiModel("VIEW") +public class VExpertfeeDonor extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 鎶ラ攢鍗曟眹鎬昏〃id锛坰ervice_fundtax锛� */ + @ApiModelProperty("鎶ラ攢鍗曟眹鎬昏〃id锛坰ervice_fundtax锛�") +// @Excel(name = "鎶ラ攢鍗曟眹鎬昏〃id", readConverterExp = "s=ervice_fundtax") + private Long fundTaxId; + + /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */ + @ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID") +// @Excel(name = "鍏宠仈service_donatebaseinfo琛ㄧ殑ID") + private Long infoid; + + /** 鎹愮尞鑰呭鍚� */ + @ApiModelProperty("鎹愮尞鑰呭鍚�") + @Excel(name = "鎹愮尞鑰呭鍚�") + private String donorname; + + /** $column.columnComment */ + @ApiModelProperty("$column.columnComment") + @Excel(name = "涓撳璐�-绋庡墠") + private BigDecimal pretaxamount; + + /** $column.columnComment */ + @ApiModelProperty("$column.columnComment") + @Excel(name = "涓撳璐�-涓◣") + private BigDecimal taxamount; + + /** $column.columnComment */ + @ApiModelProperty("$column.columnComment") + @Excel(name = "涓撳璐�-绋庡悗") + private BigDecimal taxedamount; + + /** $column.columnComment */ + @ApiModelProperty("$column.columnComment") + @Excel(name = "") + private String str; + + /** $column.columnComment */ + @ApiModelProperty("$column.columnComment") + @Excel(name = "鎹愮尞鑰呭尰瀛︽敮鎸佹垚鏈�") + private BigDecimal donormedicalcost; + + /** $column.columnComment */ + @ApiModelProperty("$column.columnComment") + @Excel(name = "閬椾綋淇鍙婂杽鍚庢垚鏈�") + private BigDecimal donorbodycost; + + /** $column.columnComment */ + @ApiModelProperty("$column.columnComment") + @Excel(name = "鍣ㄥ畼鑾峰彇鎵嬫湳鎴愭湰") + private BigDecimal organgaincost; + + /** $column.columnComment */ + @ApiModelProperty("$column.columnComment") + @Excel(name = "鍣ㄥ畼鍖诲鏀寔鎴愭湰") + private BigDecimal organmedicalcost; + + /** $column.columnComment */ + @ApiModelProperty("$column.columnComment") + @Excel(name = "鎴愭湰鍚堣") + private BigDecimal donorcost; + +} + diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java index 452e154..5e9be8e 100644 --- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java +++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceFundSharedMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.project.domain.ServiceFundShared; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -25,5 +26,5 @@ List<ServiceFundShared> getFundShareInfoById(Long fundid); - Boolean delfundsharedInfoById(Long fundId,Long serfunid); + Boolean delfundsharedInfoById(@Param("fundId") Long fundId,@Param("serfunid") Long serfunid); } diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeDonorMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeDonorMapper.java new file mode 100644 index 0000000..ee2cedf --- /dev/null +++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/VExpertfeeDonorMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.project.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.project.domain.VExpertfeeDonor; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * VIEWMapper鎺ュ彛 + * + * @author ruoyi + * @date 2024-05-08 + */ +@Mapper +public interface VExpertfeeDonorMapper extends BaseMapper<VExpertfeeDonor> +{ + /** + * 鏌ヨVIEW鍒楄〃 + * + * @param vExpertfeeDonor VIEW + * @return VIEW闆嗗悎 + */ + public List<VExpertfeeDonor> selectVExpertfeeDonorList(VExpertfeeDonor vExpertfeeDonor); + public List<VExpertfeeDonor> selectVExpertfeeDonorList2(Integer taxId); +} diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeDonorService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeDonorService.java new file mode 100644 index 0000000..23e9b5f --- /dev/null +++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IVExpertfeeDonorService.java @@ -0,0 +1,24 @@ +package com.ruoyi.project.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.project.domain.VExpertfeeDonor; + +import java.util.List; + +/** + * VIEWService鎺ュ彛 + * + * @author ruoyi + * @date 2024-05-08 + */ +public interface IVExpertfeeDonorService extends IService<VExpertfeeDonor> +{ + + /** + * 鏌ヨVIEW鍒楄〃 + * + * @param vExpertfeeDonor VIEW + * @return VIEW闆嗗悎 + */ + public List<VExpertfeeDonor> queryList(VExpertfeeDonor vExpertfeeDonor); +} 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 37b6adb..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 @@ -77,6 +77,9 @@ private VExpertfeeExpertMapper vExpertfeeExpertMapper; @Autowired + private VExpertfeeDonorMapper vExpertfeeDonorMapper; + + @Autowired private VExpertfeeTotalMapper vExpertfeeTotalMapper; @@ -189,7 +192,8 @@ try { uploadOAFileAndUpdateDb(serviceFunddetailShareds.get(i)); } catch (Exception e) { - log.error("Exception涓叆鍙傜殑ID涓猴細{}", id); + e.printStackTrace(); + log.error("Exception涓叆鍙傜殑ID涓猴細{},寮傚父淇℃伅涓� 锛� {}", id, e.getMessage()); if (id != null) { Boolean aBoolean = sharedService.delfundsharedInfoById(null, id); log.error("fund2鍒嗕韩琛ㄩ噷鐨勬暟鎹槸鍚﹀垹闄ゆ垚鍔燂細{}", aBoolean); @@ -929,13 +933,18 @@ AjaxResult ajaxResult = util.exportExcel(list, "vExpertfeeTotal"); String filePath = RuoYiConfig.getDownloadPath() + ajaxResult.get("msg"); - List<VExpertfeeExpert> list2 = vExpertfeeExpertMapper.selectVExpertfeeExpertListByFaxId(faxId); - ExcelUtil<VExpertfeeExpert> util2 = new ExcelUtil<VExpertfeeExpert>(VExpertfeeExpert.class); - AjaxResult ajaxResult1 = util2.exportExcel(list2, "vExpertfeeExpert"); + 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(ajaxResult1.get("msg").toString()); + list1.add(ajaxResult2.get("msg").toString()); + list1.add(ajaxResult3.get("msg").toString()); String name = "涓撳璐规眹鎬诲崟" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xlsx"; @@ -1014,6 +1023,9 @@ 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()); } 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 01b4ad9..e6cda1b 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 @@ -156,7 +156,7 @@ } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public Boolean addSharedData(Long id) { log.info("addSharedData鏂规硶鐨勫叆鍙俰d :{}", id); //鍏堝垽鏂竴涓媠hare琛ㄦ槸鍚﹀凡缁忔彃鍏� @@ -204,6 +204,7 @@ Boolean aBoolean = sharedService.delResharedInfoById(serviceReimbursementShared.getId()); log.error("鏂囦欢涓婁紶澶辫触锛屽皢鍒嗕韩琛ㄦ暟鎹洖婊氾細{}", aBoolean); } + e.getMessage(); return false; } diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeDonorServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeDonorServiceImpl.java new file mode 100644 index 0000000..7487327 --- /dev/null +++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VExpertfeeDonorServiceImpl.java @@ -0,0 +1,70 @@ +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.VExpertfeeDonor; +import com.ruoyi.project.mapper.VExpertfeeDonorMapper; +import com.ruoyi.project.service.IVExpertfeeDonorService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * VIEWService涓氬姟灞傚鐞� + * + * @author ruoyi + * @date 2024-05-08 + */ +@Service +public class VExpertfeeDonorServiceImpl extends ServiceImpl<VExpertfeeDonorMapper, VExpertfeeDonor> implements IVExpertfeeDonorService +{ + + + /** + * 鏌ヨVIEW鍒楄〃 + * + * @param vExpertfeeDonor VIEW + * @return VIEW + */ + @Override + public List<VExpertfeeDonor> queryList(VExpertfeeDonor vExpertfeeDonor) { + LambdaQueryWrapper<VExpertfeeDonor> wrappers = Wrappers.lambdaQuery(); + if (vExpertfeeDonor.getFundTaxId() != null){ + wrappers.eq(VExpertfeeDonor::getFundTaxId ,vExpertfeeDonor.getFundTaxId()); + } + if (vExpertfeeDonor.getInfoid() != null){ + wrappers.eq(VExpertfeeDonor::getInfoid ,vExpertfeeDonor.getInfoid()); + } + if (StringUtils.isNotBlank(vExpertfeeDonor.getDonorname())){ + wrappers.like(VExpertfeeDonor::getDonorname ,vExpertfeeDonor.getDonorname()); + } + if (vExpertfeeDonor.getPretaxamount() != null){ + wrappers.eq(VExpertfeeDonor::getPretaxamount ,vExpertfeeDonor.getPretaxamount()); + } + if (vExpertfeeDonor.getTaxamount() != null){ + wrappers.eq(VExpertfeeDonor::getTaxamount ,vExpertfeeDonor.getTaxamount()); + } + if (vExpertfeeDonor.getTaxedamount() != null){ + wrappers.eq(VExpertfeeDonor::getTaxedamount ,vExpertfeeDonor.getTaxedamount()); + } + if (vExpertfeeDonor.getDonormedicalcost() != null){ + wrappers.eq(VExpertfeeDonor::getDonormedicalcost ,vExpertfeeDonor.getDonormedicalcost()); + } + if (vExpertfeeDonor.getDonorbodycost() != null){ + wrappers.eq(VExpertfeeDonor::getDonorbodycost ,vExpertfeeDonor.getDonorbodycost()); + } + if (vExpertfeeDonor.getOrgangaincost() != null){ + wrappers.eq(VExpertfeeDonor::getOrgangaincost ,vExpertfeeDonor.getOrgangaincost()); + } + if (vExpertfeeDonor.getOrganmedicalcost() != null){ + wrappers.eq(VExpertfeeDonor::getOrganmedicalcost ,vExpertfeeDonor.getOrganmedicalcost()); + } + if (vExpertfeeDonor.getDonorcost() != null){ + wrappers.eq(VExpertfeeDonor::getDonorcost ,vExpertfeeDonor.getDonorcost()); + } + return this.list(wrappers); + } + +} diff --git a/ruoyi-project/src/main/resources/mapper/project/VExpertfeeDonorMapper.xml b/ruoyi-project/src/main/resources/mapper/project/VExpertfeeDonorMapper.xml new file mode 100644 index 0000000..fdc8cf1 --- /dev/null +++ b/ruoyi-project/src/main/resources/mapper/project/VExpertfeeDonorMapper.xml @@ -0,0 +1,62 @@ +<?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.VExpertfeeDonorMapper"> + + <resultMap type="com.ruoyi.project.domain.VExpertfeeDonor" id="VExpertfeeDonorResult"> + <result property="fundTaxId" column="fund_tax_id" /> + <result property="infoid" column="InfoID" /> + <result property="donorname" column="DonorName" /> + <result property="pretaxamount" column="PretaxAmount" /> + <result property="taxamount" column="TaxAmount" /> + <result property="taxedamount" column="TaxedAmount" /> + <result property="donormedicalcost" column="DonorMedicalCost" /> + <result property="donorbodycost" column="DonorBodyCost" /> + <result property="organgaincost" column="OrganGainCost" /> + <result property="organmedicalcost" column="OrganMedicalCost" /> + <result property="donorcost" column="DonorCost" /> + </resultMap> + + <sql id="selectVExpertfeeDonorVo"> + select fund_tax_id, InfoID, DonorName, PretaxAmount, TaxAmount, TaxedAmount, DonorMedicalCost, DonorBodyCost, OrganGainCost, OrganMedicalCost, DonorCost from v_expertfee_donor + </sql> + + <select id="selectVExpertfeeDonorList" parameterType="com.ruoyi.project.domain.VExpertfeeDonor" resultMap="VExpertfeeDonorResult"> + <include refid="selectVExpertfeeDonorVo"/> + <where> + <if test="fundTaxId != null "> and fund_tax_id = #{fundTaxId}</if> + <if test="infoid != null "> and InfoID = #{infoid}</if> + <if test="donorname != null and donorname != ''"> and DonorName like concat('%', #{donorname}, '%')</if> + <if test="pretaxamount != null "> and PretaxAmount = #{pretaxamount}</if> + <if test="taxamount != null "> and TaxAmount = #{taxamount}</if> + <if test="taxedamount != null "> and TaxedAmount = #{taxedamount}</if> + <if test="donormedicalcost != null "> and DonorMedicalCost = #{donormedicalcost}</if> + <if test="donorbodycost != null "> and DonorBodyCost = #{donorbodycost}</if> + <if test="organgaincost != null "> and OrganGainCost = #{organgaincost}</if> + <if test="organmedicalcost != null "> and OrganMedicalCost = #{organmedicalcost}</if> + <if test="donorcost != null "> and DonorCost = #{donorcost}</if> + </where> + </select> + + <select id="selectVExpertfeeDonorList2" parameterType="com.ruoyi.project.domain.VExpertfeeDonor" resultMap="VExpertfeeDonorResult"> + select DonorName, PretaxAmount, TaxAmount, TaxedAmount, DonorMedicalCost, DonorBodyCost, OrganGainCost, OrganMedicalCost, DonorCost from v_expertfee_donor + where fund_tax_id = #{taxId} + UNION + SELECT + '鍚堣' as DonorName, + SUM(PretaxAmount) as PretaxAmount, + SUM(TaxAmount) as TaxAmount, + SUM(TaxedAmount) as TaxedAmount, + SUM(DonorMedicalCost) as DonorMedicalCost, + SUM(DonorBodyCost) as DonorBodyCost, + SUM(OrganGainCost) as OrganGainCost, + SUM(OrganMedicalCost) as OrganMedicalCost, + SUM(DonorCost) as DonorCost + FROM v_expertfee_donor + where fund_tax_id = #{taxId} + </select> + + + +</mapper> diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java index 25bca83..a4f3aaf 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java @@ -640,35 +640,35 @@ serviceFundflowrule.setApplytype("1"); List<ServiceFundflowrule> serviceFundflowrules2 = iServiceFundflowruleService.queryList(serviceFundflowrule); log.info("涓撳鍔冲姟鐨勬渶楂樼瓑绾�:{}", serviceFundflowrules2.get(0).getTotallevel()); - addFunfShared(serviceFundflowrules2.get(0).getTotallevel().longValue(), "1"); + addFundShared(serviceFundflowrules2.get(0).getTotallevel().longValue(), "1"); //浼︾悊涓撳鍔冲姟璐圭敵璇� serviceFundflowrule.setApplytype("2"); List<ServiceFundflowrule> serviceFundflowrules3 = iServiceFundflowruleService.queryList(serviceFundflowrule); log.info("浼︾悊涓撳鍔冲姟璐圭敵璇�:{}", serviceFundflowrules3.get(0).getTotallevel()); - addFunfShared(serviceFundflowrules3.get(0).getTotallevel().longValue(), "2"); + addFundShared(serviceFundflowrules3.get(0).getTotallevel().longValue(), "2"); //鍖诲鎴愭湰鎶ラ攢 serviceFundflowrule.setApplytype("3"); List<ServiceFundflowrule> serviceFundflowrules4 = iServiceFundflowruleService.queryList(serviceFundflowrule); log.info("鍖诲鎴愭湰鎶ラ攢:{}", serviceFundflowrules4.get(0).getTotallevel()); - addFunfShared(serviceFundflowrules4.get(0).getTotallevel().longValue(), "3"); + addFundShared(serviceFundflowrules4.get(0).getTotallevel().longValue(), "3"); //鍔炲叕璐圭敤鎶ラ攢 serviceFundflowrule.setApplytype("4"); List<ServiceFundflowrule> serviceFundflowrules5 = iServiceFundflowruleService.queryList(serviceFundflowrule); log.info("鍔炲叕璐圭敤鎶ラ攢:{}", serviceFundflowrules5.get(0).getTotallevel()); - addFunfShared(serviceFundflowrules5.get(0).getTotallevel().longValue(), "4"); + addFundShared(serviceFundflowrules5.get(0).getTotallevel().longValue(), "4"); //缁╂晥瀹℃壒鎶ラ攢 serviceFundflowrule.setApplytype("5"); List<ServiceFundflowrule> serviceFundflowrules6 = iServiceFundflowruleService.queryList(serviceFundflowrule); log.info("鍔炲叕璐圭敤鎶ラ攢:{}", serviceFundflowrules6.get(0).getTotallevel()); - addFunfShared(serviceFundflowrules6.get(0).getTotallevel().longValue(), "5"); + addFundShared(serviceFundflowrules6.get(0).getTotallevel().longValue(), "5"); } - private void addFunfShared(Long totallevel, String applyType) { + private void addFundShared(Long totallevel, String applyType) { ServiceFund serviceFund = new ServiceFund(); serviceFund.setFlowlevel(totallevel); serviceFund.setUploadStates(1); -- Gitblit v1.9.3